The patch titled
Subject: autofs: fix autofs_sbi() does not check super block type
has been added to the -mm tree. Its filename is
autofs-fix-autofs_sbi-does-not-check-super-block-type.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/autofs-fix-autofs_sbi-does-not-check-super-block-type.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/autofs-fix-autofs_sbi-does-not-check-super-block-type.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Ian Kent <raven@xxxxxxxxxx>
Subject: autofs: fix autofs_sbi() does not check super block type
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@xxxxxxxxxxxxxxxx
Reported-by: <syzbot+87c3c541582e56943277@xxxxxxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Ian Kent <raven@xxxxxxxxxx>
Reviewed-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/autofs/autofs_i.h | 4 +++-
fs/autofs/inode.c | 1 -
2 files changed, 3 insertions(+), 2 deletions(-)
--- a/fs/autofs/autofs_i.h~autofs-fix-autofs_sbi-does-not-check-super-block-type
+++ a/fs/autofs/autofs_i.h
@@ -26,6 +26,7 @@
#include <linux/list.h>
#include <linux/completion.h>
#include <linux/file.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 *autofs_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 *autofs_dentry_ino(struct dentry *dentry)
--- a/fs/autofs/inode.c~autofs-fix-autofs_sbi-does-not-check-super-block-type
+++ a/fs/autofs/inode.c
@@ -10,7 +10,6 @@
#include <linux/seq_file.h>
#include <linux/pagemap.h>
#include <linux/parser.h>
-#include <linux/magic.h>
#include "autofs_i.h"
_
Patches currently in -mm which might be from raven@xxxxxxxxxx are
autofs-fix-autofs_sbi-does-not-check-super-block-type.patch
autofs-fix-directory-and-symlink-access.patch
autofs-fix-inconsistent-use-of-now-variable.patch
autofs-fix-clearing-autofs_exp_leaves-in-autofs_expire_indirect.patch
autofs-make-autofs_expire_direct-static.patch
autofs-make-autofs_expire_indirect-static.patch
autofs-make-expire-flags-usage-consistent-with-v5-params.patch
autofs-add-autofs_exp_forced-flag.patch
