From: Al Viro <viro@ftp.linux.org.uk>
To: Eric Paris <eparis@parisplace.org>
Cc: paul.moore@hp.com, netdev@vger.kernel.org, selinux@tycho.nsa.gov,
jmorris@namei.org, Alexander Viro <aviro@redhat.com>
Subject: Re: [PATCH 10/13] NetLabel: use cipso_v4_doi_search() for local CIPSOv4 functions
Date: Fri, 24 Nov 2006 05:53:59 +0000 [thread overview]
Message-ID: <20061124055358.GN3078@ftp.linux.org.uk> (raw)
In-Reply-To: <1164331474.2079.39.camel@localhost.localdomain>
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...
next prev parent reply other threads:[~2006-11-24 5:54 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-11-17 22:38 [PATCH 00/13] NetLabel cleanups for 2.6.20 paul.moore
2006-11-17 22:38 ` [PATCH 01/13] NetLabel: use gfp_t instead of int where it makes sense paul.moore
2006-11-17 22:38 ` [PATCH 02/13] NetLabel: convert the unlabeled accept flag to use RCU paul.moore
2006-11-17 22:38 ` [PATCH 03/13] NetLabel: change netlbl_secattr_init() to return void paul.moore
2006-11-17 22:38 ` [PATCH 04/13] NetLabel: make netlbl_lsm_secattr struct easier/quicker to understand paul.moore
2006-11-17 22:38 ` [PATCH 05/13] NetLabel: check for a CIPSOv4 option before we do call into the CIPSOv4 layer paul.moore
2006-11-17 22:38 ` [PATCH 06/13] NetLabel: add tag verification when adding new CIPSOv4 DOI definitions paul.moore
2006-11-17 22:38 ` [PATCH 07/13] NetLabel: fixup the handling of CIPSOv4 tags to allow for multiple tag types paul.moore
2006-11-17 22:38 ` [PATCH 08/13] NetLabel: return the correct error for translated CIPSOv4 tags paul.moore
2006-11-17 22:38 ` [PATCH 09/13] NetLabel: use the correct CIPSOv4 MLS label limits paul.moore
2006-11-17 22:38 ` [PATCH 10/13] NetLabel: use cipso_v4_doi_search() for local CIPSOv4 functions paul.moore
2006-11-24 1:24 ` Eric Paris
2006-11-24 5:53 ` Al Viro [this message]
2006-11-17 22:38 ` [PATCH 11/13] NetLabel: SELinux cleanups paul.moore
2006-11-17 22:38 ` [PATCH 12/13] SELinux: peer secid consolidation for external network labeling paul.moore
2006-11-17 22:38 ` [PATCH 13/13] NetLabel: honor the audit_enabled flag paul.moore
2006-11-18 4:12 ` [PATCH 00/13] NetLabel cleanups for 2.6.20 [GIT] James Morris
2006-11-18 16:10 ` Paul Moore
2006-11-19 3:19 ` James Morris
-- strict thread matches above, loose matches on Subject: below --
2006-11-24 18:59 [PATCH 10/13] NetLabel: use cipso_v4_doi_search() for local CIPSOv4 functions Paul Moore
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=20061124055358.GN3078@ftp.linux.org.uk \
--to=viro@ftp.linux.org.uk \
--cc=aviro@redhat.com \
--cc=eparis@parisplace.org \
--cc=jmorris@namei.org \
--cc=netdev@vger.kernel.org \
--cc=paul.moore@hp.com \
--cc=selinux@tycho.nsa.gov \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).