Skip to contentSkip to conversation

NetLabel: use cipso_v4_doi_search() for local CIPSOv4 functions

PATCH Paul Moore 1 participant 1 message Nov 24, 2006

Subsystems (3)
lore
Share & tools
lore

Paul Moore

author
#0 lore raw

-----Original Message-----
From: Al Viro <[email protected]>
Date: Friday, Nov 24, 2006 2:07 am
Subject: Re: [PATCH 10/13] NetLabel: use cipso_v4_doi_search() for local CIPSOv4 functions

Quoted 25 lines · Eric Paris

net/ipv4/cipso_ipv4.c int cipso_v4_validate(unsigned char **op · line 1142

Quoted 13 lines · On Fri, 2006-11-17 at 17:38 -0500, [email protected] wrote:

Index: net-2.6.20_netlabel-base-work/net/ipv4/cipso_ipv4.c
===================================================================

net/ipv4/cipso_ipv4.c +1 -1
@@ -1136,7 +1136,7 @@ int cipso_v4_validate(unsigned char **op
 	}
 
 	rcu_read_lock();
-	doi_def = cipso_v4_doi_getdef(ntohl(*((__be32 *)&opt[2])));
+	doi_def = cipso_v4_doi_search(ntohl(*((u32 *)&opt[2])));
 	if (doi_def == NULL) {
 		err_offset = 2;
 		goto validate_return_locked;

This appears to reverse the previous endian work by Al Viro, was this intended?

Mismerge, most likely. Fixed in net-2.6.20 since then ( commit 835ec2525544c744333bf0da00049f323eb75c58

Author: Al Viro <[email protected]>
Date:   Mon Nov 20 18:08:37 2006 -0800
Quoted 7 lines

[CIPSO]: Missing annotation in cipso_ipv4 update.
)

Note that there are two changes in that line - u32 -> __be32 and
..._getdef -> ..._search. They do not really conflict, but any merge tool would throw a conflict at that point and apparently it got resolved the dumb way...

Yep, Al is right, I just made a dumb mistake when merging my code with the latest net-2.6.20 tree. I thought I caught everything but it looks like I missed one. Sorry.

. paul moore
. linux security @ hp

--
This message was distributed to subscribers of the selinux mailing list. If you no longer wish to subscribe, send mail to [email protected] with the words "unsubscribe selinux" without quotes as the message.