rpms/sepostgresql/devel sepostgresql-8.2.5-1.patch, 1.2, 1.3 sepostgresql.init, 1.4, 1.5 sepostgresql.spec, 1.4, 1.5 sepostgresql.te, 1.4, 1.5

[KaiGai Kohei (kaigai)]

Author: kaigai

Update of /cvs/pkgs/rpms/sepostgresql/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10469

Modified Files:
	sepostgresql-8.2.5-1.patch sepostgresql.init sepostgresql.spec 
	sepostgresql.te 
Log Message:
FIXBUG: security context was not canonicalized
        when irregular context (but interpretable) was inputed.


sepostgresql-8.2.5-1.patch:

Index: sepostgresql-8.2.5-1.patch
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/devel/sepostgresql-8.2.5-1.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sepostgresql-8.2.5-1.patch	15 Oct 2007 12:38:40 -0000	1.2
+++ sepostgresql-8.2.5-1.patch	17 Oct 2007 11:20:57 -0000	1.3
@@ -3559,8 +3559,8 @@
 +}
 diff -rpNU3 postgresql-8.2.5/src/backend/security/sepgsqlHooks.c sepostgresql-8.2.5/src/backend/security/sepgsqlHooks.c
 --- postgresql-8.2.5/src/backend/security/sepgsqlHooks.c	1970-01-01 09:00:00.000000000 +0900
-+++ sepostgresql-8.2.5/src/backend/security/sepgsqlHooks.c	2007-08-09 17:28:31.000000000 +0900
-@@ -0,0 +1,668 @@
++++ sepostgresql-8.2.5/src/backend/security/sepgsqlHooks.c	2007-10-17 19:32:14.000000000 +0900
+@@ -0,0 +1,676 @@
 +/*
 + * src/backend/sepgsqlHooks.c
 + *   SE-PostgreSQL hooks
@@ -3937,22 +3937,30 @@
 + * security_label hooks
 + *******************************************************************************/
 +char *sepgsqlSecurityLabelIn(char *context) {
-+	security_context_t raw_context;
++	security_context_t raw_context, canonical_context;
 +	char *result;
++	int rc;
++
++	rc = selinux_trans_to_raw_context(context, &raw_context);
++	if (rc)
++		selerror("could not translate MLS label");
++
++	rc = security_canonicalize_context_raw(raw_context, &canonical_context);
++	freecon(raw_context);
++	if (rc)
++		selerror("could not canonicalize the context");
 +
-+	if (selinux_trans_to_raw_context(context, &raw_context))
-+        selerror("could not translate MLS label");
 +	PG_TRY();
 +	{
-+		result = pstrdup(raw_context);
++		result = pstrdup(canonical_context);
 +	}
 +	PG_CATCH();
 +	{
-+		freecon(raw_context);
++		freecon(canonical_context);
 +		PG_RE_THROW();
 +	}
 +	PG_END_TRY();
-+	freecon(raw_context);
++	freecon(canonical_context);
 +
 +	return result;
 +}


Index: sepostgresql.init
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/devel/sepostgresql.init,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sepostgresql.init	15 Oct 2007 12:38:40 -0000	1.4
+++ sepostgresql.init	17 Oct 2007 11:20:57 -0000	1.5
@@ -9,7 +9,7 @@
 
 PGVERSION="8.2.5"
 PGMAJORVERSION=`echo "$PGVERSION" | sed 's/^\([0-9]*\.[0-9]*\).*$/\1/'`
-SEPGVERSION="1.31"
+SEPGVERSION="1.33"
 
 # source function library
 . /etc/rc.d/init.d/functions


Index: sepostgresql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/devel/sepostgresql.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sepostgresql.spec	15 Oct 2007 12:38:40 -0000	1.4
+++ sepostgresql.spec	17 Oct 2007 11:20:57 -0000	1.5
@@ -13,7 +13,7 @@
 Summary: Security Enhanced PostgreSQL
 Name: sepostgresql
 Version: 8.2.5
-Release: 1.31%{?sepgextension}%{?dist}
+Release: 1.33%{?sepgextension}%{?dist}
 License: BSD
 Group: Applications/Databases
 Url: http://code.google.com/p/sepgsql/
@@ -208,6 +208,9 @@
 %attr(700,sepgsql,sepgsql) %dir %{_localstatedir}/lib/sepgsql/backups
 
 %changelog
+* Wed Oct 17 2007 <kaigai at kaigai.gr.jp> - 8.2.5-1.33
+- Fix bug: security context was not canonicalized
+  when irregular context (but interpretable) was inputed.
 * Mon Oct 15 2007 <kaigai at kaigai.gr.jp> - 8.2.5-1.31
 - Fix bug: type definitions of security_label_to_text()
   and text_to_security_label() are mismatched.


Index: sepostgresql.te
===================================================================
RCS file: /cvs/pkgs/rpms/sepostgresql/devel/sepostgresql.te,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sepostgresql.te	15 Oct 2007 12:38:40 -0000	1.4
+++ sepostgresql.te	17 Oct 2007 11:20:57 -0000	1.5
@@ -1,4 +1,4 @@
-policy_module(sepostgresql, 1.31)
+policy_module(sepostgresql, 1.33)
 
 gen_require(`
 	all_userspace_class_perms