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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0F16DC433F5 for ; Tue, 15 Mar 2022 13:34:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1348750AbiCONgE (ORCPT ); Tue, 15 Mar 2022 09:36:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58798 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232544AbiCONgD (ORCPT ); Tue, 15 Mar 2022 09:36:03 -0400 Received: from out30-56.freemail.mail.aliyun.com (out30-56.freemail.mail.aliyun.com [115.124.30.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 58A476443 for ; Tue, 15 Mar 2022 06:34:50 -0700 (PDT) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R171e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=e01e01424;MF=hsiangkao@linux.alibaba.com;NM=1;PH=DS;RN=6;SR=0;TI=SMTPD_---0V7HuS4f_1647351284; Received: from B-P7TQMD6M-0146.local(mailfrom:hsiangkao@linux.alibaba.com fp:SMTPD_---0V7HuS4f_1647351284) by smtp.aliyun-inc.com(127.0.0.1); Tue, 15 Mar 2022 21:34:46 +0800 Date: Tue, 15 Mar 2022 21:34:44 +0800 From: Gao Xiang To: Dongliang Mu Cc: Gao Xiang , Chao Yu , Dongliang Mu , linux-erofs@lists.ozlabs.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] fs: erofs: add sanity check for kobject in erofs_unregister_sysfs Message-ID: References: <20220315132814.12332-1-dzm91@hust.edu.cn> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20220315132814.12332-1-dzm91@hust.edu.cn> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Mar 15, 2022 at 09:28:14PM +0800, Dongliang Mu wrote: > From: Dongliang Mu > > Syzkaller hit 'WARNING: kobject bug in erofs_unregister_sysfs'. This bug > is triggered by injecting fault in kobject_init_and_add of > erofs_unregister_sysfs. > > Fix this by adding sanity check for kobject in erofs_unregister_sysfs > > Note that I've tested the patch and the crash does not occur any more. > > Signed-off-by: Dongliang Mu Reviewed-by: Gao Xiang Thanks, Gao Xiang > --- > fs/erofs/sysfs.c | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) > > diff --git a/fs/erofs/sysfs.c b/fs/erofs/sysfs.c > index dac252bc9228..f3babf1e6608 100644 > --- a/fs/erofs/sysfs.c > +++ b/fs/erofs/sysfs.c > @@ -221,9 +221,11 @@ void erofs_unregister_sysfs(struct super_block *sb) > { > struct erofs_sb_info *sbi = EROFS_SB(sb); > > - kobject_del(&sbi->s_kobj); > - kobject_put(&sbi->s_kobj); > - wait_for_completion(&sbi->s_kobj_unregister); > + if (sbi->s_kobj.state_in_sysfs) { > + kobject_del(&sbi->s_kobj); > + kobject_put(&sbi->s_kobj); > + wait_for_completion(&sbi->s_kobj_unregister); > + } > } > > int __init erofs_init_sysfs(void) > -- > 2.25.1 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 Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B9BDDC433EF for ; Tue, 15 Mar 2022 13:35:01 +0000 (UTC) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4KHvXh0m3Cz30Dx for ; Wed, 16 Mar 2022 00:35:00 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=linux.alibaba.com (client-ip=115.124.30.130; helo=out30-130.freemail.mail.aliyun.com; envelope-from=hsiangkao@linux.alibaba.com; receiver=) Received: from out30-130.freemail.mail.aliyun.com (out30-130.freemail.mail.aliyun.com [115.124.30.130]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4KHvXc3kkkz2yQC for ; Wed, 16 Mar 2022 00:34:54 +1100 (AEDT) X-Alimail-AntiSpam: AC=PASS; BC=-1|-1; BR=01201311R171e4; CH=green; DM=||false|; DS=||; FP=0|-1|-1|-1|0|-1|-1|-1; HT=e01e01424; MF=hsiangkao@linux.alibaba.com; NM=1; PH=DS; RN=6; SR=0; TI=SMTPD_---0V7HuS4f_1647351284; Received: from B-P7TQMD6M-0146.local(mailfrom:hsiangkao@linux.alibaba.com fp:SMTPD_---0V7HuS4f_1647351284) by smtp.aliyun-inc.com(127.0.0.1); Tue, 15 Mar 2022 21:34:46 +0800 Date: Tue, 15 Mar 2022 21:34:44 +0800 From: Gao Xiang To: Dongliang Mu Subject: Re: [PATCH] fs: erofs: add sanity check for kobject in erofs_unregister_sysfs Message-ID: References: <20220315132814.12332-1-dzm91@hust.edu.cn> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20220315132814.12332-1-dzm91@hust.edu.cn> X-BeenThere: linux-erofs@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development of Linux EROFS file system List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-erofs@lists.ozlabs.org, Dongliang Mu , linux-kernel@vger.kernel.org Errors-To: linux-erofs-bounces+linux-erofs=archiver.kernel.org@lists.ozlabs.org Sender: "Linux-erofs" On Tue, Mar 15, 2022 at 09:28:14PM +0800, Dongliang Mu wrote: > From: Dongliang Mu > > Syzkaller hit 'WARNING: kobject bug in erofs_unregister_sysfs'. This bug > is triggered by injecting fault in kobject_init_and_add of > erofs_unregister_sysfs. > > Fix this by adding sanity check for kobject in erofs_unregister_sysfs > > Note that I've tested the patch and the crash does not occur any more. > > Signed-off-by: Dongliang Mu Reviewed-by: Gao Xiang Thanks, Gao Xiang > --- > fs/erofs/sysfs.c | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) > > diff --git a/fs/erofs/sysfs.c b/fs/erofs/sysfs.c > index dac252bc9228..f3babf1e6608 100644 > --- a/fs/erofs/sysfs.c > +++ b/fs/erofs/sysfs.c > @@ -221,9 +221,11 @@ void erofs_unregister_sysfs(struct super_block *sb) > { > struct erofs_sb_info *sbi = EROFS_SB(sb); > > - kobject_del(&sbi->s_kobj); > - kobject_put(&sbi->s_kobj); > - wait_for_completion(&sbi->s_kobj_unregister); > + if (sbi->s_kobj.state_in_sysfs) { > + kobject_del(&sbi->s_kobj); > + kobject_put(&sbi->s_kobj); > + wait_for_completion(&sbi->s_kobj_unregister); > + } > } > > int __init erofs_init_sysfs(void) > -- > 2.25.1