Resolves: https://issues.redhat.com/browse/RHEL-29313
This commit is contained in:
Daan De Meyer 2024-03-15 15:44:29 +01:00
parent 546e2c450a
commit 35ceef1ab9
2 changed files with 31 additions and 1 deletions

View File

@ -0,0 +1,26 @@
From 4c35d7a5f92499d6ed646d4a5ffad9acc10cb432 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrg=20Billeter?= <j@bitron.ch>
Date: Tue, 18 Aug 2020 17:33:49 +0200
Subject: [PATCH] Accept EROFS for access() check of /proc entries
This is required to work in a Docker container.
---
bubblewrap.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bubblewrap.c b/bubblewrap.c
index e1a4629..d65ffef 100644
--- a/bubblewrap.c
+++ b/bubblewrap.c
@@ -1148,7 +1148,7 @@ setup_newroot (bool unshare_pid,
if (access (subdir, W_OK) < 0)
{
/* The file is already read-only or doesn't exist. */
- if (errno == EACCES || errno == ENOENT)
+ if (errno == EACCES || errno == ENOENT || errno == EROFS)
continue;
die_with_error ("Can't access %s", subdir);
--
2.44.0

View File

@ -1,6 +1,6 @@
Name: bubblewrap Name: bubblewrap
Version: 0.4.1 Version: 0.4.1
Release: 6%{?dist} Release: 7%{?dist}
Summary: Core execution tool for unprivileged containers Summary: Core execution tool for unprivileged containers
License: LGPLv2+ License: LGPLv2+
@ -8,6 +8,7 @@ License: LGPLv2+
URL: https://github.com/projectatomic/bubblewrap URL: https://github.com/projectatomic/bubblewrap
Source0: https://github.com/projectatomic/bubblewrap/releases/download/v%{version}/bubblewrap-%{version}.tar.xz Source0: https://github.com/projectatomic/bubblewrap/releases/download/v%{version}/bubblewrap-%{version}.tar.xz
Patch0: 0001-Avoid-memory-leak-if-args-is-specified-multiple-time.patch Patch0: 0001-Avoid-memory-leak-if-args-is-specified-multiple-time.patch
Patch1: 0001-Accept-EROFS-for-access-check-of-proc-entries.patch
BuildRequires: autoconf automake libtool BuildRequires: autoconf automake libtool
BuildRequires: gcc BuildRequires: gcc
@ -47,6 +48,9 @@ find %{buildroot} -name '*.la' -delete -print
%{_mandir}/man1/* %{_mandir}/man1/*
%changelog %changelog
* Fri Mar 15 2024 Daan De Meyer <daan.j.demeyer@gmail.com> - 0.4.1-7
- Backport https://github.com/containers/bubblewrap/commit/4c35d7a5f92499d6ed646d4a5ffad9acc10cb432
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 0.4.1-6 * Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 0.4.1-6
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688 Related: rhbz#1991688