From: Pablo Neira Ayuso <pablo@netfilter.org>
To: Jan Engelhardt <jengelh@medozas.de>
Cc: Eric Paris <eparis@redhat.com>,
linux-kernel@vger.kernel.org, netfilter-devel@vger.kernel.org,
netfilter@vger.kernel.org, paul.moore@hp.com, jmorris@namei.org,
selinux@tycho.nsa.gov, sds@tycho.nsa.gov,
linux-security-module@vger.kernel.org,
mr.dash.four@googlemail.com
Subject: Re: [PATCH 2/5] secmark: make secmark object handling generic
Date: Tue, 12 Oct 2010 19:24:51 +0200 [thread overview]
Message-ID: <4CB499E3.5030305@netfilter.org> (raw)
In-Reply-To: <alpine.LNX.2.01.1010121824540.15529@obet.zrqbmnf.qr>
On 12/10/10 18:26, Jan Engelhardt wrote:
> On Tuesday 2010-10-12 17:40, Eric Paris wrote:
>> diff --git a/include/linux/netfilter/xt_SECMARK.h b/include/linux/netfilter/xt_SECMARK.h
>> index 6fcd344..989092b 100644
>> --- a/include/linux/netfilter/xt_SECMARK.h
>> +++ b/include/linux/netfilter/xt_SECMARK.h
>> @@ -11,18 +11,12 @@
>> * packets are being marked for.
>> */
>> #define SECMARK_MODE_SEL 0x01 /* SELinux */
>> -#define SECMARK_SELCTX_MAX 256
>> -
>> -struct xt_secmark_target_selinux_info {
>> - __u32 selsid;
>> - char selctx[SECMARK_SELCTX_MAX];
>> -};
>> +#define SECMARK_SECCTX_MAX 256
>>
>> struct xt_secmark_target_info {
>> __u8 mode;
>> - union {
>> - struct xt_secmark_target_selinux_info sel;
>> - } u;
>> + __u32 secid;
>> + char secctx[SECMARK_SECCTX_MAX];
>> };
>
> If you make changes here, bump the .revision please, in here:
The binary layout of this structure has not changed, it doesn't require
to bump the revision.
>> static struct xt_target secmark_tg_reg __read_mostly = {
>> - .name = "SECMARK",
>> - .revision = 0,
>> - .family = NFPROTO_UNSPEC,
>> - .checkentry = secmark_tg_check,
>> - .destroy = secmark_tg_destroy,
>> - .target = secmark_tg,
>> - .targetsize = sizeof(struct xt_secmark_target_info),
>> - .me = THIS_MODULE,
>> + .name = "SECMARK",
>> + .revision = 0,
>> + .family = NFPROTO_UNSPEC,
>> + .checkentry = secmark_tg_check,
>> + .destroy = secmark_tg_destroy,
>> + .target = secmark_tg,
>> + .targetsize = sizeof(struct xt_secmark_target_info),
>> + .me = THIS_MODULE,
>> };
I think that we don't need that extra tab above.
next prev parent reply other threads:[~2010-10-12 17:24 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-12 15:40 [PATCH 1/5] secmark: do not return early if there was no error Eric Paris
2010-10-12 15:40 ` [PATCH 2/5] secmark: make secmark object handling generic Eric Paris
2010-10-12 16:26 ` Jan Engelhardt
2010-10-12 17:24 ` Pablo Neira Ayuso [this message]
2010-10-12 17:45 ` Eric Paris
2010-10-12 17:53 ` Jan Engelhardt
2010-10-12 18:15 ` Pablo Neira Ayuso
2010-10-12 22:55 ` Paul Moore
2010-10-12 23:01 ` Eric Paris
2010-10-12 23:06 ` Paul Moore
2010-10-12 23:14 ` Eric Paris
2010-10-12 23:20 ` Paul Moore
2010-10-12 15:40 ` [PATCH 3/5] security: secid_to_secctx returns len when data is NULL Eric Paris
2010-10-12 23:04 ` Paul Moore
2010-10-12 15:40 ` [PATCH 4/5] conntrack: export lsm context rather than internal secid via netlink Eric Paris
2010-10-12 23:14 ` Paul Moore
2010-10-12 23:24 ` Eric Paris
2010-10-13 13:41 ` Paul Moore
2010-10-12 15:40 ` [PATCH 5/5] secmark: export secctx, drop secmark in procfs Eric Paris
2010-10-12 23:19 ` Paul Moore
2010-10-12 23:27 ` Eric Paris
2010-10-12 22:52 ` [PATCH 1/5] secmark: do not return early if there was no error Paul Moore
2010-10-12 23:38 ` James Morris
2010-10-12 23:50 ` Eric Paris
2010-10-13 4:07 ` James Morris
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=4CB499E3.5030305@netfilter.org \
--to=pablo@netfilter.org \
--cc=eparis@redhat.com \
--cc=jengelh@medozas.de \
--cc=jmorris@namei.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=mr.dash.four@googlemail.com \
--cc=netfilter-devel@vger.kernel.org \
--cc=netfilter@vger.kernel.org \
--cc=paul.moore@hp.com \
--cc=sds@tycho.nsa.gov \
--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).