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

Commit 8b34a7b1 authored by Ian Kent's avatar Ian Kent Committed by Greg Kroah-Hartman
Browse files

autofs: fix autofs_sbi() does not check super block type 

commit 0633da48f0793aeba27f82d30605624416723a91 upstream.

autofs_sbi() does not check the superblock magic number to verify it has
been given an autofs super block.

Backport Note: autofs4 has been renamed to autofs upstream. As a result
the upstream patch does not apply cleanly onto 4.14.y.

Link: http://lkml.kernel.org/r/153475422934.17131.7563724552005298277.stgit@pluto.themaw.net


Reported-by: default avatar <syzbot+87c3c541582e56943277@syzkaller.appspotmail.com>
Signed-off-by: default avatarIan Kent <raven@themaw.net>
Reviewed-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarZubin Mithra <zsm@chromium.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent daf0ca74

fs/autofs4/autofs_i.h

+3 −1
Original line number Original line Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <linux/list.h>

#include <linux/list.h>

#include <linux/completion.h>

#include <linux/completion.h>

#include <asm/current.h>

#include <asm/current.h>

#include <linux/magic.h>





/* This is the range of ioctl() numbers we claim as ours */

/* This is the range of ioctl() numbers we claim as ours */

#define AUTOFS_IOC_FIRST     AUTOFS_IOC_READY

#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)

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)

static inline struct autofs_info *autofs4_dentry_ino(struct dentry *dentry)

fs/autofs4/inode.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -14,7 +14,6 @@ 
#include <linux/pagemap.h>

#include <linux/pagemap.h>

#include <linux/parser.h>

#include <linux/parser.h>

#include <linux/bitops.h>

#include <linux/bitops.h>

#include <linux/magic.h>

#include "autofs_i.h"

#include "autofs_i.h"

#include <linux/module.h>

#include <linux/module.h>