[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <4CB499E3.5030305@netfilter.org>
Date: Tue, 12 Oct 2010 19:24:51 +0200
From: Pablo Neira Ayuso <pablo@...filter.org>
To: Jan Engelhardt <jengelh@...ozas.de>
CC: Eric Paris <eparis@...hat.com>, linux-kernel@...r.kernel.org,
netfilter-devel@...r.kernel.org, netfilter@...r.kernel.org,
paul.moore@...com, jmorris@...ei.org, selinux@...ho.nsa.gov,
sds@...ho.nsa.gov, linux-security-module@...r.kernel.org,
mr.dash.four@...glemail.com
Subject: Re: [PATCH 2/5] secmark: make secmark object handling generic
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.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists