diff --git a/libselinux-rhat.patch b/libselinux-rhat.patch index d688291..514e100 100644 --- a/libselinux-rhat.patch +++ b/libselinux-rhat.patch @@ -61,7 +61,7 @@ diff --exclude-from=exclude -N -u -r nsalibselinux/src/callbacks.c libselinux-2. va_end(ap); diff --exclude-from=exclude -N -u -r nsalibselinux/src/init.c libselinux-2.0.90/src/init.c --- nsalibselinux/src/init.c 2009-07-14 11:16:03.000000000 -0400 -+++ libselinux-2.0.90/src/init.c 2010-01-18 16:56:16.000000000 -0500 ++++ libselinux-2.0.90/src/init.c 2010-02-22 11:04:16.000000000 -0500 @@ -23,7 +23,7 @@ static void init_selinuxmnt(void) { @@ -71,14 +71,18 @@ diff --exclude-from=exclude -N -u -r nsalibselinux/src/init.c libselinux-2.0.90/ struct statfs sfbuf; int rc; size_t len; -@@ -59,14 +59,14 @@ +@@ -57,16 +57,17 @@ + break; + } } - fclose(fp); +- fclose(fp); - if (!exists) - return; + if (!exists) + goto out; ++ ++ fclose(fp); /* At this point, the usual spot doesn't have an selinuxfs so * we look around for it */ @@ -89,7 +93,7 @@ diff --exclude-from=exclude -N -u -r nsalibselinux/src/init.c libselinux-2.0.90/ __fsetlocking(fp, FSETLOCKING_BYCALLER); while ((num = getline(&buf, &len, fp)) != -1) { -@@ -90,7 +90,8 @@ +@@ -90,7 +91,8 @@ out: free(buf); @@ -125,7 +129,7 @@ diff --exclude-from=exclude -N -u -r nsalibselinux/src/libselinux.pc.in libselin Name: libselinux diff --exclude-from=exclude -N -u -r nsalibselinux/src/Makefile libselinux-2.0.90/src/Makefile --- nsalibselinux/src/Makefile 2009-12-01 15:46:50.000000000 -0500 -+++ libselinux-2.0.90/src/Makefile 2010-02-18 10:04:21.000000000 -0500 ++++ libselinux-2.0.90/src/Makefile 2010-02-18 10:20:27.000000000 -0500 @@ -11,6 +11,7 @@ RUBYPLATFORM ?= $(shell ruby -e 'print RUBY_PLATFORM') RUBYINC ?= $(LIBDIR)/ruby/$(RUBYLIBVER)/$(RUBYPLATFORM) diff --git a/libselinux.spec b/libselinux.spec index be2adc6..052a356 100644 --- a/libselinux.spec +++ b/libselinux.spec @@ -5,7 +5,7 @@ Summary: SELinux library and simple utilities Name: libselinux Version: 2.0.90 -Release: 4%{?dist} +Release: 5%{?dist} License: Public Domain Group: System Environment/Libraries Source: http://www.nsa.gov/research/selinux/%{name}-%{version}.tgz @@ -166,6 +166,9 @@ exit 0 %{ruby_sitearch}/selinux.so %changelog +* Mon Feb 22 2010 Dan Walsh - 2.0.90-5 +- Fix potential doublefree on init + * Thu Feb 18 2010 Dan Walsh - 2.0.90-4 - Fix libselinux.pc