- prevent setfacl --restore from SIGSEGV on malformed restore file
(#576550)
This commit is contained in:
parent
706b25668b
commit
8920fea074
27
acl-2.2.49-setfacl-restore.patch
Normal file
27
acl-2.2.49-setfacl-restore.patch
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
diff --git a/setfacl/setfacl.c b/setfacl/setfacl.c
|
||||||
|
index be34e69..db9976f 100644
|
||||||
|
--- a/setfacl/setfacl.c
|
||||||
|
+++ b/setfacl/setfacl.c
|
||||||
|
@@ -125,7 +125,7 @@ restore(
|
||||||
|
uid_t uid;
|
||||||
|
gid_t gid;
|
||||||
|
mode_t mask, flags;
|
||||||
|
- struct do_set_args args;
|
||||||
|
+ struct do_set_args args = { 0 };
|
||||||
|
int line = 0, backup_line;
|
||||||
|
int error, status = 0;
|
||||||
|
|
||||||
|
diff --git a/test/misc.test b/test/misc.test
|
||||||
|
index 7c62c64..8c885a8 100644
|
||||||
|
--- a/test/misc.test
|
||||||
|
+++ b/test/misc.test
|
||||||
|
@@ -424,3 +424,9 @@ Now, chmod should change the group_obj entry
|
||||||
|
>
|
||||||
|
|
||||||
|
$ rmdir d
|
||||||
|
+
|
||||||
|
+Malformed restore file
|
||||||
|
+
|
||||||
|
+ $ echo "# owner: root" > f
|
||||||
|
+ $ setfacl --restore=f 2>&1
|
||||||
|
+ >setfacl: f: No filename found in line 0, aborting
|
7
acl.spec
7
acl.spec
@ -1,7 +1,7 @@
|
|||||||
Summary: Access control list utilities
|
Summary: Access control list utilities
|
||||||
Name: acl
|
Name: acl
|
||||||
Version: 2.2.49
|
Version: 2.2.49
|
||||||
Release: 2%{?dist}
|
Release: 3%{?dist}
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
BuildRequires: libattr-devel >= 2.4.1
|
BuildRequires: libattr-devel >= 2.4.1
|
||||||
BuildRequires: autoconf, libtool >= 1.5, gettext, gawk
|
BuildRequires: autoconf, libtool >= 1.5, gettext, gawk
|
||||||
@ -9,6 +9,7 @@ Source: http://download.savannah.gnu.org/releases-noredirect/acl/acl-%{version}.
|
|||||||
Patch0: acl-2.2.3-multilib.patch
|
Patch0: acl-2.2.3-multilib.patch
|
||||||
Patch1: acl-2.2.39-build.patch
|
Patch1: acl-2.2.39-build.patch
|
||||||
Patch2: acl-2.2.49-setfacl-walk.patch
|
Patch2: acl-2.2.49-setfacl-walk.patch
|
||||||
|
Patch3: acl-2.2.49-setfacl-restore.patch
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
Group: System Environment/Base
|
Group: System Environment/Base
|
||||||
URL: http://oss.sgi.com/projects/xfs/
|
URL: http://oss.sgi.com/projects/xfs/
|
||||||
@ -46,6 +47,7 @@ defined in POSIX 1003.1e draft standard 17.
|
|||||||
%patch0 -p1
|
%patch0 -p1
|
||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
%patch2 -p1
|
%patch2 -p1
|
||||||
|
%patch3 -p1
|
||||||
autoconf
|
autoconf
|
||||||
|
|
||||||
%build
|
%build
|
||||||
@ -101,6 +103,9 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
/%{_lib}/libacl.so.*
|
/%{_lib}/libacl.so.*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Mar 24 2010 Kamil Dudka <kdudka@redhat.com> 2.2.49-3
|
||||||
|
- prevent setfacl --restore from SIGSEGV on malformed restore file (#576550)
|
||||||
|
|
||||||
* Sat Dec 26 2009 Kamil Dudka <kdudka@redhat.com> 2.2.49-2
|
* Sat Dec 26 2009 Kamil Dudka <kdudka@redhat.com> 2.2.49-2
|
||||||
- tweaked setfacl tree walk flags (#488674), thanks to Markus Steinborn
|
- tweaked setfacl tree walk flags (#488674), thanks to Markus Steinborn
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user