Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756193Ab2KHRme (ORCPT ); Thu, 8 Nov 2012 12:42:34 -0500 Received: from mail-ob0-f174.google.com ([209.85.214.174]:51890 "EHLO mail-ob0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752176Ab2KHRmb (ORCPT ); Thu, 8 Nov 2012 12:42:31 -0500 MIME-Version: 1.0 In-Reply-To: References: <1352189869-27190-1-git-send-email-jarkko.sakkinen@iki.fi> <50998834.5030407@schaufler-ca.com> Date: Thu, 8 Nov 2012 19:42:31 +0200 X-Google-Sender-Auth: iYGjP5MpTygwTTcLsZa52DQR_rY Message-ID: Subject: Re: [PATCH] smack: SMACK_MAGIC to include/uapi/linux/magic.h From: Jarkko Sakkinen To: Eric Paris Cc: Casey Schaufler , James Morris , Linux Kernel Mailing List , LSM List Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2750 Lines: 73 On Thu, Nov 8, 2012 at 5:04 PM, 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) Fully agree. Just answered to the query :) > > On Thu, Nov 8, 2012 at 5:43 AM, Jarkko Sakkinen wrote: >> On Tue, Nov 6, 2012 at 11:59 PM, Casey Schaufler 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 >>> > --- >>> > 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 majordomo@vger.kernel.org >> 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 majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/