[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CACLa4ps1ZFfgtj0N999vsBR__fWJYXGbJFOHMakP08EzzvmVUA@mail.gmail.com>
Date: Tue, 6 Nov 2012 17:23:06 -0500
From: Eric Paris <eparis@...isplace.org>
To: Casey Schaufler <casey@...aufler-ca.com>
Cc: Jarkko Sakkinen <jarkko.sakkinen@....fi>,
James Morris <james.l.morris@...cle.com>,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
LSM List <linux-security-module@...r.kernel.org>
Subject: Re: [PATCH] smack: SMACK_MAGIC to include/uapi/linux/magic.h
It looks like smack_lsm.c includes linux/magic.h, but smackfs.c
doesn't... Seems like they should have included linux/magic.h in the
same header they removed the definition from....
On Tue, Nov 6, 2012 at 4:59 PM, Casey Schaufler <casey@...aufler-ca.com> wrote:
> On 11/6/2012 12:17 AM, Jarkko Sakkinen wrote:
>> SMACK_MAGIC moved to a proper place for easy user space access
>> (i.e. libsmack).
>>
>> Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@....fi>
>> ---
>> include/uapi/linux/magic.h | 1 +
>> security/smack/smack.h | 5 -----
>> 2 files changed, 1 insertion(+), 5 deletions(-)
>
> Will security/smack/smack_lsm.c and security/smack/smackfs.c
> compile after this change?
>
>>
>> diff --git a/include/uapi/linux/magic.h b/include/uapi/linux/magic.h
>> index e15192c..12735ad 100644
>> --- a/include/uapi/linux/magic.h
>> +++ b/include/uapi/linux/magic.h
>> @@ -11,6 +11,7 @@
>> #define DEBUGFS_MAGIC 0x64626720
>> #define SECURITYFS_MAGIC 0x73636673
>> #define SELINUX_MAGIC 0xf97cff8c
>> +#define SMACK_MAGIC 0x43415d53 /* "SMAC" */
>> #define RAMFS_MAGIC 0x858458f6 /* some random number */
>> #define TMPFS_MAGIC 0x01021994
>> #define HUGETLBFS_MAGIC 0x958458f6 /* some random number */
>> diff --git a/security/smack/smack.h b/security/smack/smack.h
>> index 99b3612..8ad3095 100644
>> --- a/security/smack/smack.h
>> +++ b/security/smack/smack.h
>> @@ -149,11 +149,6 @@ struct smack_known {
>> #define SMACK_CIPSO_SOCKET 1
>>
>> /*
>> - * smackfs magic number
>> - */
>> -#define SMACK_MAGIC 0x43415d53 /* "SMAC" */
>> -
>> -/*
>> * CIPSO defaults.
>> */
>> #define SMACK_CIPSO_DOI_DEFAULT 3 /* Historical */
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-security-module" in
> the body of a message to majordomo@...r.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
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