Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759263AbYHHS4H (ORCPT ); Fri, 8 Aug 2008 14:56:07 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755488AbYHHSzw (ORCPT ); Fri, 8 Aug 2008 14:55:52 -0400 Received: from e5.ny.us.ibm.com ([32.97.182.145]:58008 "EHLO e5.ny.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754988AbYHHSzv (ORCPT ); Fri, 8 Aug 2008 14:55:51 -0400 Subject: [PATCH 2/4] integrity: special fs magic From: Mimi Zohar To: linux-kernel@vger.kernel.org Cc: linux-security-module@vger.kernel.org, Al Viro , Stephen Smalley , James Morris , Randy Dunlap , safford@watson.ibm.com, serue@linux.vnet.ibm.com, sailer@watson.ibm.com, zohar@us.ibm.com References: <20080808184349.999902616@linux.vnet.ibm.com> Content-Type: text/plain Date: Fri, 08 Aug 2008 14:55:42 -0400 Message-Id: <1218221742.4444.12.camel@localhost.localdomain> Mime-Version: 1.0 X-Mailer: Evolution 2.22.3.1 (2.22.3.1-1.fc9) Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2595 Lines: 78 - Move special fs magic number definitions to magic.h - Add magic.h include Signed-off-by: Mimi Zohar Reviewed-by: James Morris Index: security-testing-2.6/fs/debugfs/inode.c =================================================================== --- security-testing-2.6.orig/fs/debugfs/inode.c +++ security-testing-2.6/fs/debugfs/inode.c @@ -26,8 +26,7 @@ #include #include #include - -#define DEBUGFS_MAGIC 0x64626720 +#include static struct vfsmount *debugfs_mount; static int debugfs_mount_count; Index: security-testing-2.6/include/linux/magic.h =================================================================== --- security-testing-2.6.orig/include/linux/magic.h +++ security-testing-2.6/include/linux/magic.h @@ -6,6 +6,10 @@ #define AFS_SUPER_MAGIC 0x5346414F #define AUTOFS_SUPER_MAGIC 0x0187 #define CODA_SUPER_MAGIC 0x73757245 +#define DEBUGFS_MAGIC 0x64626720 +#define SYSFS_MAGIC 0x62656572 +#define SECURITYFS_MAGIC 0x73636673 +#define TMPFS_MAGIC 0x01021994 #define EFS_SUPER_MAGIC 0x414A53 #define EXT2_SUPER_MAGIC 0xEF53 #define EXT3_SUPER_MAGIC 0xEF53 Index: security-testing-2.6/mm/shmem.c =================================================================== --- security-testing-2.6.orig/mm/shmem.c +++ security-testing-2.6/mm/shmem.c @@ -50,14 +50,12 @@ #include #include #include +#include #include #include #include -/* This magic number is used in glibc for posix shared memory */ -#define TMPFS_MAGIC 0x01021994 - #define ENTRIES_PER_PAGE (PAGE_CACHE_SIZE/sizeof(unsigned long)) #define ENTRIES_PER_PAGEPAGE (ENTRIES_PER_PAGE*ENTRIES_PER_PAGE) #define BLOCKS_PER_PAGE (PAGE_CACHE_SIZE/512) Index: security-testing-2.6/security/inode.c =================================================================== --- security-testing-2.6.orig/security/inode.c +++ security-testing-2.6/security/inode.c @@ -20,8 +20,7 @@ #include #include #include - -#define SECURITYFS_MAGIC 0x73636673 +#include static struct vfsmount *mount; static int mount_count; -- -- 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/