From: "Paul Moore" <paul.moore@hp.com>
To: <viro@ftp.linux.org.uk>
Cc: <eparis@parisplace.org>, <netdev@vger.kernel.org>,
<selinux@tycho.nsa.gov>, <jmorris@namei.org>, <aviro@redhat.com>
Subject: Re: [PATCH 10/13] NetLabel: use cipso_v4_doi_search() for local CIPSOv4 functions
Date: 24 Nov 2006 13:59:00 -0500 [thread overview]
Message-ID: <3247221600.11766119@mail.hp.com> (raw)
-----Original Message-----
From: Al Viro <viro@ftp.linux.org.uk>
Date: Friday, Nov 24, 2006 2:07 am
Subject: Re: [PATCH 10/13] NetLabel: use cipso_v4_doi_search() for local CIPSOv4 functions
On Thu, Nov 23, 2006 at 08:24:34PM -0500, Eric Paris wrote:
> On Fri, 2006-11-17 at 17:38 -0500, paul.moore@hp.com wrote:
>
> > Index: net-2.6.20_netlabel-base-work/net/ipv4/cipso_ipv4.c
> > ===================================================================
> > --- net-2.6.20_netlabel-base-work.orig/net/ipv4/cipso_ipv4.c
> > +++ net-2.6.20_netlabel-base-work/net/ipv4/cipso_ipv4.c
> > @@ -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 <viro@zeniv.linux.org.uk>
>Date: Mon Nov 20 18:08:37 2006 -0800
>
> [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 majordomo@tycho.nsa.gov with
the words "unsubscribe selinux" without quotes as the message.
WARNING: multiple messages have this Message-ID (diff)
From: "Paul Moore" <paul.moore@hp.com>
To: <viro@ftp.linux.org.uk>
Cc: <eparis@parisplace.org>, <netdev@vger.kernel.org>,
<selinux@tycho.nsa.gov>, <jmorris@namei.org>, <aviro@redhat.com>
Subject: Re: [PATCH 10/13] NetLabel: use cipso_v4_doi_search() for local CIPSOv4 functions
Date: 24 Nov 2006 13:59:00 -0500 [thread overview]
Message-ID: <3247221600.11766119@mail.hp.com> (raw)
-----Original Message-----
From: Al Viro <viro@ftp.linux.org.uk>
Date: Friday, Nov 24, 2006 2:07 am
Subject: Re: [PATCH 10/13] NetLabel: use cipso_v4_doi_search() for local CIPSOv4 functions
On Thu, Nov 23, 2006 at 08:24:34PM -0500, Eric Paris wrote:
> On Fri, 2006-11-17 at 17:38 -0500, paul.moore@hp.com wrote:
>
> > Index: net-2.6.20_netlabel-base-work/net/ipv4/cipso_ipv4.c
> > ===================================================================
> > --- net-2.6.20_netlabel-base-work.orig/net/ipv4/cipso_ipv4.c
> > +++ net-2.6.20_netlabel-base-work/net/ipv4/cipso_ipv4.c
> > @@ -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 <viro@zeniv.linux.org.uk>
>Date: Mon Nov 20 18:08:37 2006 -0800
>
> [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
next reply other threads:[~2006-11-24 19:00 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-11-24 18:59 Paul Moore [this message]
2006-11-24 18:59 ` [PATCH 10/13] NetLabel: use cipso_v4_doi_search() for local CIPSOv4 functions Paul Moore
-- strict thread matches above, loose matches on Subject: below --
2006-11-17 22:38 [PATCH 00/13] NetLabel cleanups for 2.6.20 paul.moore
2006-11-17 22:38 ` [PATCH 10/13] NetLabel: use cipso_v4_doi_search() for local CIPSOv4 functions paul.moore
2006-11-17 22:38 ` paul.moore
2006-11-24 1:24 ` Eric Paris
2006-11-24 1:24 ` Eric Paris
2006-11-24 5:53 ` Al Viro
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=3247221600.11766119@mail.hp.com \
--to=paul.moore@hp.com \
--cc=aviro@redhat.com \
--cc=eparis@parisplace.org \
--cc=jmorris@namei.org \
--cc=netdev@vger.kernel.org \
--cc=selinux@tycho.nsa.gov \
--cc=viro@ftp.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.