Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 92562927 authored by Mimi Zohar's avatar Mimi Zohar Committed by James Morris
Browse files

integrity: special fs magic 



Discussion on the mailing list questioned the use of these
magic values in userspace, concluding these values are already
exported to userspace via statfs and their correct/incorrect
usage is left up to the userspace application.

  - Move special fs magic number definitions to magic.h
  - Add magic.h include

Signed-off-by: default avatarMimi Zohar <zohar@us.ibm.com>
Reviewed-by: default avatarJames Morris <jmorris@namei.org>
Signed-off-by: default avatarJames Morris <jmorris@namei.org>
parent 93db6286

fs/debugfs/inode.c

+1 −2
Original line number Diff line number Diff line
@@ -26,8 +26,7 @@ 
#include <linux/debugfs.h>

#include <linux/fsnotify.h>

#include <linux/string.h>



#define DEBUGFS_MAGIC	0x64626720

#include <linux/magic.h>



static struct vfsmount *debugfs_mount;

static int debugfs_mount_count;

include/linux/magic.h

+4 −0
Original line number Diff line number Diff line
@@ -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

mm/shmem.c

+1 −3
Original line number Diff line number Diff line
@@ -50,14 +50,12 @@ 
#include <linux/migrate.h>

#include <linux/highmem.h>

#include <linux/seq_file.h>

#include <linux/magic.h>



#include <asm/uaccess.h>

#include <asm/div64.h>

#include <asm/pgtable.h>



/* 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)

security/inode.c

+1 −2
Original line number Diff line number Diff line
@@ -20,8 +20,7 @@ 
#include <linux/init.h>

#include <linux/namei.h>

#include <linux/security.h>



#define SECURITYFS_MAGIC	0x73636673

#include <linux/magic.h>



static struct vfsmount *mount;

static int mount_count;