rpms/libselinux/F-12 libselinux-rhat.patch, 1.202, 1.203 libselinux.spec, 1.381, 1.382

[Daniel J Walsh]

Author: dwalsh

Update of /cvs/extras/rpms/libselinux/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22290

Modified Files:
	libselinux-rhat.patch libselinux.spec 
Log Message:
* Mon Feb 22 2010 Dan Walsh <dwalsh at redhat.com> - 2.0.90-5
- Fix potential doublefree on init


libselinux-rhat.patch:
 man/man8/selinuxconlist.8 |   18 ++++++++++++++++++
 man/man8/selinuxdefcon.8  |   24 ++++++++++++++++++++++++
 src/Makefile              |    3 ++-
 src/callbacks.c           |    1 +
 src/init.c                |   14 ++++++++------
 src/label_file.c          |    3 +++
 src/libselinux.pc.in      |    2 +-
 src/matchpathcon.c        |    3 ++-
 8 files changed, 59 insertions(+), 9 deletions(-)

Index: libselinux-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/libselinux/F-12/libselinux-rhat.patch,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -p -r1.202 -r1.203
--- libselinux-rhat.patch	18 Feb 2010 15:28:12 -0000	1.202
+++ libselinux-rhat.patch	22 Feb 2010 16:36:00 -0000	1.203
@@ -61,7 +61,7 @@ diff --exclude-from=exclude -N -u -r nsa
  	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 nsa
  	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 nsa
  
  	__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 nsa
  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)


Index: libselinux.spec
===================================================================
RCS file: /cvs/extras/rpms/libselinux/F-12/libselinux.spec,v
retrieving revision 1.381
retrieving revision 1.382
diff -u -p -r1.381 -r1.382
--- libselinux.spec	18 Feb 2010 15:28:12 -0000	1.381
+++ libselinux.spec	22 Feb 2010 16:36:02 -0000	1.382
@@ -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 <dwalsh at redhat.com> - 2.0.90-5
+- Fix potential doublefree on init
+
 * Thu Feb 18 2010 Dan Walsh <dwalsh at redhat.com> - 2.0.90-4
 - Fix libselinux.pc