From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Miller Subject: Re: [PATCH v2] XFRM: assorted IPsec fixups Date: Tue, 11 Dec 2007 09:06:11 -0800 (PST) Message-ID: <20071211.090611.59888503.davem@davemloft.net> References: <20071211163019.15059.73746.stgit@flek.lan> Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20071211163019.15059.73746.stgit@flek.lan> Sender: netdev-owner@vger.kernel.org To: paul.moore@hp.com Cc: netdev@vger.kernel.org, linux-audit@redhat.com, selinux@tycho.nsa.gov List-Id: linux-audit@redhat.com From: Paul Moore Date: Tue, 11 Dec 2007 11:30:19 -0500 Sorry for not pointing this out sooner: > * Convert 'sid' to 'secid' > The 'sid' name is specific to SELinux, 'secid' is the common naming > convention used by the kernel when refering to tokenized LSM labels ... > diff --git a/include/linux/xfrm.h b/include/linux/xfrm.h > index b58adc5..f75a337 100644 > --- a/include/linux/xfrm.h > +++ b/include/linux/xfrm.h > @@ -31,7 +31,7 @@ struct xfrm_sec_ctx { > __u8 ctx_doi; > __u8 ctx_alg; > __u16 ctx_len; > - __u32 ctx_sid; > + __u32 ctx_secid; > char ctx_str[0]; > }; > This datastructure has been exported to userspace, so we really can't member names unless it was added only in 2.6.24 and I don't think it was. Correct me if I'm wrong.