From patchwork Mon Aug 20 08:37:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Kent X-Patchwork-Id: 10570001 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D0BA6109C for ; Mon, 20 Aug 2018 08:46:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BEF942927E for ; Mon, 20 Aug 2018 08:46:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B18622928D; Mon, 20 Aug 2018 08:46:42 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 81C8F2927E for ; Mon, 20 Aug 2018 08:46:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726032AbeHTMBR (ORCPT ); Mon, 20 Aug 2018 08:01:17 -0400 Received: from icp-osb-irony-out1.external.iinet.net.au ([203.59.1.210]:38239 "EHLO icp-osb-irony-out1.external.iinet.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725948AbeHTMBR (ORCPT ); Mon, 20 Aug 2018 08:01:17 -0400 X-Greylist: delayed 561 seconds by postgrey-1.27 at vger.kernel.org; Mon, 20 Aug 2018 08:01:15 EDT X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2AXDgB5fXpb/602LHlbhACBUBIog3CUJEwBAQEBAQEGgRA4gyqFH4Q2iQWBeh4YAYRAg00hNRcBAgEBAQEBAQJtKIVhBFIoAQwCGA4CSRYThRcMpQR7MxoCijyBC4gNF3mBB4ESM4peglcCjUcvjQYJj2AViFMDhWEBK5RAATWBUk0uCjuCaZBgMjB7AQGNVgEB X-IPAS-Result: A2AXDgB5fXpb/602LHlbhACBUBIog3CUJEwBAQEBAQEGgRA4gyqFH4Q2iQWBeh4YAYRAg00hNRcBAgEBAQEBAQJtKIVhBFIoAQwCGA4CSRYThRcMpQR7MxoCijyBC4gNF3mBB4ESM4peglcCjUcvjQYJj2AViFMDhWEBK5RAATWBUk0uCjuCaZBgMjB7AQGNVgEB X-IronPort-AV: E=Sophos;i="5.53,264,1531756800"; d="scan'208";a="122976998" Received: from unknown (HELO pluto.themaw.net) ([121.44.54.173]) by icp-osb-irony-out1.iinet.net.au with ESMTP; 20 Aug 2018 16:37:10 +0800 Subject: [PATCH] autofs - fix autofs_sbi() does not check super block type From: Ian Kent To: Andrew Morton Cc: linux-fsdevel , autofs mailing list , Kernel Mailing List Date: Mon, 20 Aug 2018 16:37:09 +0800 Message-ID: <153475422934.17131.7563724552005298277.stgit@pluto.themaw.net> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The autofs_sbi() inline function does not check the super block magic number to verify it has been given an autofs super block. Reported-by: syzbot+87c3c541582e56943277@syzkaller.appspotmail.com Signed-off-by: Ian Kent --- fs/autofs/autofs_i.h | 4 +++- fs/autofs/inode.c | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/fs/autofs/autofs_i.h b/fs/autofs/autofs_i.h index 9400a9f6318a..5057b9f0f846 100644 --- a/fs/autofs/autofs_i.h +++ b/fs/autofs/autofs_i.h @@ -26,6 +26,7 @@ #include #include #include +#include /* 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) diff --git a/fs/autofs/inode.c b/fs/autofs/inode.c index b51980fc274e..846c052569dd 100644 --- a/fs/autofs/inode.c +++ b/fs/autofs/inode.c @@ -10,7 +10,6 @@ #include #include #include -#include #include "autofs_i.h"