>>SELinux Mailing List: by thread

• Contemporary messages sorted: [ by date ] [ by thread ] [ by subject ] [ by author ]

From: Ryan Senior <slax_at_ksni.net>
subject: patch
Date: Tue, 14 Aug 2001 10:32:00 -0500

• This message: [ Message body ]
• Next message: Stephen Smalley: "Re: SE Linux II?"
• Previous message: Eric Peters: "Re: SE Linux II?"
• Next in thread: Stephen Smalley: "Re: patch"
• Reply: Stephen Smalley: "Re: patch"

I "applied" the patch, but it didn't apply properly.

The following is what I get:

(Stripping trailing CRs from patch.)
patching file initpolicy.conf

Hunk #1 FAILED at 1775.
Hunk #2 FAILED at 1813.
Hunk #3 FAILED at 2090.

3 out of 3 hunks FAILED -- saving rejects to file initpolicy.conf.rej

I am far from an expert at using patch, in fact aside from patching the kernel, I haven't used patch much at all. If you need, I could also paste in what the .rej file says.

Any assistance is appreciated,

Ryan

--
You have received this message because you are subscribed to the selinux list.
If you no longer wish to subscribe, send mail to majordomo@tycho.nsa.gov with
the words "unsubscribe selinux" without quotes as the message.

From: Stephen Smalley <sds_at_tislabs.com>
subject: Re: patch
Date: Wed, 15 Aug 2001 08:55:40 -0400 (EDT)

• This message: [ Message body ]
• Next message: Jones, Robyn M.: "Red Hat 6.1"
• Previous message: Stephen Smalley: "Re: SE Linux II?"
• In reply to: Ryan Senior: "patch"

On Tue, 14 Aug 2001, Ryan Senior wrote:

> patching file initpolicy.conf

The patch is for the kernel-2.4/security/policy_parse.y file, so it shouldn't be modifying initpolicy.conf at all. I've attached a version of the patch that should be easier to apply. Assuming that you save it to ~/parser.patch, apply it as follows:

cd slinux
patch -p1 < ~/parser.patch

It should say: patching file kernel-2.4/security/policy_parse.y.

Then do 'cd kernel-2.4; make' to rebuild the checkpolicy program. You should then be able to compile the policy configuration.

--
Stephen D. Smalley, NAI Labs
ssmalley@nai.com





Index: slinux/kernel-2.4/security/policy_parse.y
diff -u slinux/kernel-2.4/security/policy_parse.y:1.1 slinux/kernel-2.4/security/policy_parse.y:1.2
--- slinux/kernel-2.4/security/policy_parse.y:1.1	Fri Jan  5 14:18:02 2001
+++ slinux/kernel-2.4/security/policy_parse.y	Mon May  7 14:01:23 2001
@@ -1775,7 +1775,6 @@
 {
 	char *id;
 	class_datum_t *cladatum;
-	type_datum_t *datum;
 	perm_datum_t *perdatum;
 	ebitmap_t stypes, ttypes, tclasses;
 	access_vector_t *avp;
@@ -1814,7 +1813,7 @@
 	hiclass = 0;
 	while ((id = queue_remove(id_queue))) {
 		cladatum = hashtab_search(policydbp->p_classes.table, id);
-		if (!datum) {
+		if (!cladatum) {
 			sprintf(errormsg, "unknown class %s used in rule", id);
 			yyerror(errormsg);
 			goto bad;
@@ -2091,7 +2090,6 @@
 		if (ret) {
 			yyerror("hash table overflow");
 			free(role);
-			free(id);
 			free(role_id);
 			return -1;
 		}

--
You have received this message because you are subscribed to the selinux list.
If you no longer wish to subscribe, send mail to majordomo@tycho.nsa.gov with
the words "unsubscribe selinux" without quotes as the message.

• Contemporary messages sorted: [ by date ] [ by thread ] [ by subject ] [ by author ]

This archive was generated by hypermail 2.2.0 on Wed 11 Jun 2008 - 08:10:54 EDT