From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.6 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 35D3FC3A59D for ; Thu, 22 Aug 2019 04:22:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E9F8822CF7 for ; Thu, 22 Aug 2019 04:22:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1566447774; bh=vL3O7zV4eT/drYJWGBMDLuZzO6G1BXPkGKQhtKdJCTo=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-ID:From; b=KbKRUzOpJpVKp4GOBOeeMPEBjPhQUS4R87rGMS7Z7iEGkm4UNA+217k49laGMidam QW8qghGXcfLJkQOI6Mr44as7jKdeu1li0jLJuU0Yh6BxRZuGrSDaKf2/zkifQlZqMY DEsZh/85dIANZN+O8VHDhklA5K6w2Sr3BZnqXang= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730459AbfHVEWw (ORCPT ); Thu, 22 Aug 2019 00:22:52 -0400 Received: from mail.kernel.org ([198.145.29.99]:54746 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726206AbfHVEWw (ORCPT ); Thu, 22 Aug 2019 00:22:52 -0400 Received: from zzz.localdomain (unknown [67.218.105.90]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 4DDEB21848; Thu, 22 Aug 2019 04:22:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1566447771; bh=vL3O7zV4eT/drYJWGBMDLuZzO6G1BXPkGKQhtKdJCTo=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=WhonCjjeH9VjCTuo8AXzMw90Skhv2LeKC/fub1+RVJGsvvx32t+4YfI0l3vgXfTfx uV+qFSO2CTayBD3neRN0B2vU3N6xJ4k3GH61tWiNKAUSPsDAVf6FvFAZ3AKfx2xWfq 2TxfLfhXfUZsLwC7eumM5KJa0peH5/gZsOtG/I0o= Date: Wed, 21 Aug 2019 21:22:49 -0700 From: Eric Biggers To: viro@zeniv.linux.org.uk Cc: dhowells@redhat.com, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, syzkaller-bugs@googlegroups.com Subject: Re: [PATCH v2] fs: fs_parser: avoid NULL param->string to kstrtouint Message-ID: <20190822042249.GJ6111@zzz.localdomain> Mail-Followup-To: viro@zeniv.linux.org.uk, dhowells@redhat.com, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, syzkaller-bugs@googlegroups.com References: <20190719232949.27978-1-nh26223.lmm@gmail.com> <20190816024654.GA12185@sol.localdomain> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190816024654.GA12185@sol.localdomain> User-Agent: Mutt/1.12.1 (2019-06-15) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [trimmed Cc list a bit] On Thu, Aug 15, 2019 at 07:46:56PM -0700, Eric Biggers wrote: > On Sat, Jul 20, 2019 at 07:29:49AM +0800, Yin Fengwei wrote: > > syzbot reported general protection fault in kstrtouint: > > https://lkml.org/lkml/2019/7/18/328 > > > > From the log, if the mount option is something like: > > fd,XXXXXXXXXXXXXXXXXXXX > > > > The default parameter (which has NULL param->string) will be > > passed to vfs_parse_fs_param. Finally, this NULL param->string > > is passed to kstrtouint and trigger NULL pointer access. > > > > Reported-by: syzbot+398343b7c1b1b989228d@syzkaller.appspotmail.com > > Fixes: 71cbb7570a9a ("vfs: Move the subtype parameter into fuse") > > > > Signed-off-by: Yin Fengwei > > --- > > ChangeLog: > > v1 -> v2: > > - Fix typo in v1 > > - Remove braces {} from single statement blocks > > > > fs/fs_parser.c | 3 +++ > > 1 file changed, 3 insertions(+) > > > > diff --git a/fs/fs_parser.c b/fs/fs_parser.c > > index 83b66c9e9a24..7498a44f18c0 100644 > > --- a/fs/fs_parser.c > > +++ b/fs/fs_parser.c > > @@ -206,6 +206,9 @@ int fs_parse(struct fs_context *fc, > > case fs_param_is_fd: { > > switch (param->type) { > > case fs_value_is_string: > > + if (!result->has_value) > > + goto bad_value; > > + > > ret = kstrtouint(param->string, 0, &result->uint_32); > > break; > > case fs_value_is_file: > > -- > > 2.17.1 > > Reviewed-by: Eric Biggers > > Al, can you please apply this patch? > > - Eric Ping. Al, when are you going to apply this? - Eric