On Thu, Nov 8, 2012 at 7:40 PM, Casey Schaufler <[email protected]> wrote: > On 11/8/2012 7:04 AM, Eric Paris wrote: >> Then it only works by accident that magic.h is included by some random >> path in smackfs.c. You really should be including it in smack.h (or >> each .c file individually, up to casey) > > I should think it should go in smack.h
Yeah, that's probably best place for it. I'll add the include there. > >> On Thu, Nov 8, 2012 at 5:43 AM, Jarkko Sakkinen <[email protected]> >> wrote: >>> On Tue, Nov 6, 2012 at 11:59 PM, Casey Schaufler <[email protected]> >>> 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 <[email protected]> >>>>> --- >>>>> 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? >>> Sorry I haven't replied earlier. Anyway, I made a sanity check. >>> >>> I retried build from clean. Works. I also checked that vmlinux contains >>> SMACK symbols. It does. >>> >>>>> 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 */ >>> /Jarkko >>> -- >>> To unsubscribe from this list: send the line "unsubscribe >>> linux-security-module" in >>> the body of a message to [email protected] >>> More majordomo info at http://vger.kernel.org/majordomo-info.html > /Jarkko -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
