- Fix segfault if seusers file does not work

This commit is contained in:
Daniel J Walsh 2008-12-16 14:38:49 +00:00
parent d9847be233
commit 0c692a5a64
2 changed files with 6 additions and 3 deletions

View File

@ -2961,7 +2961,7 @@ diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinuxswig_wrap.c libsel
printf("SWIG_InitializeModule: size %d\n", swig_module.size); printf("SWIG_InitializeModule: size %d\n", swig_module.size);
diff --exclude-from=exclude -N -u -r nsalibselinux/src/seusers.c libselinux-2.0.76/src/seusers.c diff --exclude-from=exclude -N -u -r nsalibselinux/src/seusers.c libselinux-2.0.76/src/seusers.c
--- nsalibselinux/src/seusers.c 2008-08-28 09:34:24.000000000 -0400 --- nsalibselinux/src/seusers.c 2008-08-28 09:34:24.000000000 -0400
+++ libselinux-2.0.76/src/seusers.c 2008-12-12 11:06:18.000000000 -0500 +++ libselinux-2.0.76/src/seusers.c 2008-12-16 09:36:39.000000000 -0500
@@ -243,3 +243,67 @@ @@ -243,3 +243,67 @@
*r_level = NULL; *r_level = NULL;
return 0; return 0;
@ -3025,7 +3025,7 @@ diff --exclude-from=exclude -N -u -r nsalibselinux/src/seusers.c libselinux-2.0.
+ +
+ err: + err:
+ free(buffer); + free(buffer);
+ fclose(fp); + if (fp) fclose(fp);
+ free(rec); + free(rec);
+ +
+ return (ret ? getseuserbyname(username, r_seuser, r_level) : ret); + return (ret ? getseuserbyname(username, r_seuser, r_level) : ret);

View File

@ -5,7 +5,7 @@
Summary: SELinux library and simple utilities Summary: SELinux library and simple utilities
Name: libselinux Name: libselinux
Version: 2.0.76 Version: 2.0.76
Release: 4%{?dist} Release: 5%{?dist}
License: Public Domain License: Public Domain
Group: System Environment/Libraries Group: System Environment/Libraries
Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
@ -163,6 +163,9 @@ exit 0
%{ruby_sitearch}/selinux.so %{ruby_sitearch}/selinux.so
%changelog %changelog
* Tue Dec 16 2008 Dan Walsh <dwalsh@redhat.com> - 2.0.76-5
- Fix segfault if seusers file does not work
* Fri Dec 12 2008 Dan Walsh <dwalsh@redhat.com> - 2.0.76-4 * Fri Dec 12 2008 Dan Walsh <dwalsh@redhat.com> - 2.0.76-4
- Add new function getseuser which will take username and service and return - Add new function getseuser which will take username and service and return
- seuser and level. ipa will populate file in future. - seuser and level. ipa will populate file in future.