Created
October 7, 2016 14:10
-
-
Save AlexanderS/0665b4405d5a31a6406def2231ed46bc to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff -r -u linux-3.18.21-vs2.3.7.4/fs/overlayfs/super.c linux-3.18.21-securemount-overlayfs/fs/overlayfs/super.c | |
--- linux-3.18.21-vs2.3.7.4/fs/overlayfs/super.c 2015-09-01 00:19:23.000000000 +0200 | |
+++ linux-3.18.21-securemount-overlayfs/fs/overlayfs/super.c 2016-10-07 16:09:39.031970876 +0200 | |
@@ -18,14 +18,13 @@ | |
#include <linux/sched.h> | |
#include <linux/statfs.h> | |
#include <linux/seq_file.h> | |
+#include <linux/magic.h> | |
#include "overlayfs.h" | |
MODULE_AUTHOR("Miklos Szeredi <miklos@szeredi.hu>"); | |
MODULE_DESCRIPTION("Overlay filesystem"); | |
MODULE_LICENSE("GPL"); | |
-#define OVERLAYFS_SUPER_MAGIC 0x794c7630 | |
- | |
struct ovl_config { | |
char *lowerdir; | |
char *upperdir; | |
diff -r -u linux-3.18.21-vs2.3.7.4/fs/super.c linux-3.18.21-securemount-overlayfs/fs/super.c | |
--- linux-3.18.21-vs2.3.7.4/fs/super.c 2016-07-19 23:40:13.056001275 +0200 | |
+++ linux-3.18.21-securemount-overlayfs/fs/super.c 2016-10-07 16:06:57.375976382 +0200 | |
@@ -1120,7 +1120,8 @@ | |
if (!vx_capable(CAP_SYS_ADMIN, VXC_BINARY_MOUNT) && | |
!sb->s_bdev && | |
(sb->s_magic != PROC_SUPER_MAGIC) && | |
- (sb->s_magic != DEVPTS_SUPER_MAGIC)) | |
+ (sb->s_magic != DEVPTS_SUPER_MAGIC) && | |
+ (sb->s_magic != OVERLAYFS_SUPER_MAGIC)) | |
goto out_sb; | |
error = security_sb_kern_mount(sb, flags, secdata); | |
diff -r -u linux-3.18.21-vs2.3.7.4/include/uapi/linux/magic.h linux-3.18.21-securemount-overlayfs/include/uapi/linux/magic.h | |
--- linux-3.18.21-vs2.3.7.4/include/uapi/linux/magic.h 2015-09-01 00:19:23.000000000 +0200 | |
+++ linux-3.18.21-securemount-overlayfs/include/uapi/linux/magic.h 2016-10-07 16:08:44.279972741 +0200 | |
@@ -73,4 +73,6 @@ | |
#define ANON_INODE_FS_MAGIC 0x09041934 | |
#define BTRFS_TEST_MAGIC 0x73727279 | |
+#define OVERLAYFS_SUPER_MAGIC 0x794c7630 | |
+ | |
#endif /* __LINUX_MAGIC_H__ */ |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment