Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.com>2018-11-01 14:04:41 +1100
committerNeilBrown <neilb@suse.com>2018-11-01 14:06:21 +1100
commitd55d9b29bf613e2687127b503037895768a51ef1 (patch)
tree1280e5202bfeafaaafc15191652fc8094baaea05
parente72d60f4c12ba55d739a009aee3bc83e0be11571 (diff)
autofs: fix autofs_sbi() does not check super block type
(git-fixes).
-rw-r--r--patches.fixes/autofs-fix-autofs_sbi-does-not-check-super-block-typ.patch53
-rw-r--r--series.conf1
2 files changed, 54 insertions, 0 deletions
diff --git a/patches.fixes/autofs-fix-autofs_sbi-does-not-check-super-block-typ.patch b/patches.fixes/autofs-fix-autofs_sbi-does-not-check-super-block-typ.patch
new file mode 100644
index 0000000000..26b827607b
--- /dev/null
+++ b/patches.fixes/autofs-fix-autofs_sbi-does-not-check-super-block-typ.patch
@@ -0,0 +1,53 @@
+From: Ian Kent <raven@themaw.net>
+Date: Tue, 21 Aug 2018 21:51:45 -0700
+Subject: [PATCH] autofs: fix autofs_sbi() does not check super block type
+Git-commit: 0633da48f0793aeba27f82d30605624416723a91
+Patch-mainline: v4.19
+References: git-fixes
+
+autofs_sbi() does not check the superblock magic number to verify it has
+been given an autofs super block.
+
+Link: http://lkml.kernel.org/r/153475422934.17131.7563724552005298277.stgit@pluto.themaw.net
+Reported-by: <syzbot+87c3c541582e56943277@syzkaller.appspotmail.com>
+Signed-off-by: Ian Kent <raven@themaw.net>
+Reviewed-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Acked-by: NeilBrown <neilb@suse.com>
+
+---
+ fs/autofs4/autofs_i.h | 4 +++-
+ fs/autofs4/inode.c | 1 -
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+--- a/fs/autofs4/autofs_i.h
++++ b/fs/autofs4/autofs_i.h
+@@ -15,6 +15,7 @@
+ #include <linux/spinlock.h>
+ #include <linux/list.h>
+ #include <linux/completion.h>
++#include <linux/magic.h>
+
+ /* This is the range of ioctl() numbers we claim as ours */
+ #define AUTOFS_IOC_FIRST AUTOFS_IOC_READY
+@@ -124,7 +125,8 @@ struct autofs_sb_info {
+
+ static inline struct autofs_sb_info *autofs4_sbi(struct super_block *sb)
+ {
+- return (struct autofs_sb_info *)(sb->s_fs_info);
++ return sb->s_magic != AUTOFS_SUPER_MAGIC ?
++ NULL : (struct autofs_sb_info *)(sb->s_fs_info);
+ }
+
+ static inline struct autofs_info *autofs4_dentry_ino(struct dentry *dentry)
+--- a/fs/autofs4/inode.c
++++ b/fs/autofs4/inode.c
+@@ -14,7 +14,6 @@
+ #include <linux/pagemap.h>
+ #include <linux/parser.h>
+ #include <linux/bitops.h>
+-#include <linux/magic.h>
+ #include "autofs_i.h"
+ #include <linux/module.h>
+
diff --git a/series.conf b/series.conf
index 8b0fb5365e..96417315cc 100644
--- a/series.conf
+++ b/series.conf
@@ -17783,6 +17783,7 @@
patches.fixes/fuse-Add-missed-unlock_page-to-fuse_readpages_fill.patch
patches.drivers/PM-sleep-wakeup-Fix-build-error-caused-by-missing-SR
patches.suse/0001-ACPICA-Reference-Counts-increase-max-to-0x4000-for-l.patch
+ patches.fixes/autofs-fix-autofs_sbi-does-not-check-super-block-typ.patch
patches.fixes/lib-test_hexdump.c-fix-failure-on-big-endian-cpu.patch
patches.fixes/hfsplus-don-t-return-0-when-fill_super-failed.patch
patches.fixes/reiserfs-fix-broken-xattr-handling-heap-corruption-b.patch