rpms/patch
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fixed NULL dereference in selinux patch.

Browse Source
This commit is contained in:
Tim Waugh 2011-11-25 18:07:08 +00:00
parent a8918bbef6
commit 13704094f0
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
patch-selinux.patch
View File

@ -128,7 +128,7 @@ diff -up patch-2.6.1/src/pch.c.selinux patch-2.6.1/src/pch.c
validate_target_name (inname); validate_target_name (inname);
+ if (getfilecon (inname, &incontext) == -1) + if (getfilecon (inname, &incontext) == -1)
+ if (errno == ENODATA || errno == ENOTSUP) + if (errno == ENODATA || errno == ENOTSUP)
+ *incontext = NULL; + incontext = NULL;
} }
return retval; return retval;

5
patch.spec
View File

@ -1,7 +1,7 @@
Summary: Utility for modifying/upgrading files Summary: Utility for modifying/upgrading files
Name: patch Name: patch
Version: 2.6.1 Version: 2.6.1
Release: 10%{?dist} Release: 11%{?dist}
License: GPLv2+ License: GPLv2+
URL: http://www.gnu.org/software/patch/patch.html URL: http://www.gnu.org/software/patch/patch.html
Group: Development/Tools Group: Development/Tools
@ -75,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/*/* %{_mandir}/*/*
%changelog %changelog
* Fri Nov 25 2011 Tim Waugh <twaugh@redhat.com> 2.6.1-11
- Fixed NULL dereference in selinux patch.
* Mon May 16 2011 Tim Waugh <twaugh@redhat.com> 2.6.1-10 * Mon May 16 2011 Tim Waugh <twaugh@redhat.com> 2.6.1-10
- Applied Jiri Popelka's fixes from Coverity scan (bug #704554): - Applied Jiri Popelka's fixes from Coverity scan (bug #704554):
- Avoid unchecked return from getfilecon() in patch-selinux.patch. - Avoid unchecked return from getfilecon() in patch-selinux.patch.