From patchwork Mon Oct 24 11:29:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 9805 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp554815wru; Mon, 24 Oct 2022 09:58:07 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7XD/MEpIAd4jL0F6TfJxa0hKzDrsNWgF4RjMblGQWfmer8kHs/TijyAbt4ki6YzYFsfW9U X-Received: by 2002:a17:90a:7849:b0:20d:2d54:65d with SMTP id y9-20020a17090a784900b0020d2d54065dmr75462026pjl.219.1666630687340; Mon, 24 Oct 2022 09:58:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666630687; cv=none; d=google.com; s=arc-20160816; b=F3VHZFGzuuyxqWbEVZU7zVzzP0dzlzgvPftei6EojG5i00n/yTD+5kMqYV5Rfr60IB fH6wAXYuNCYwtX+0rIiJKI/nU6R2WEj0nSSvZF1j1Pg+JTUC+64S53QIW0R7Kit1Jpah wevSjEw5eG4r04wxXXoQcr3BK/vBF7LvPlaE4Vx0faCvCOjBxff8z+XDoj/QktntRuwD Wim1jBKIRHXVc/y7DhsKYSJJwVNFhlOXq3sSiHFsjA+DTQxg+NIURCiQ+YhWFqH2tZmx rCvEVhPFAfWDrufqsj5zWgtgqAPaWaMus/ojJiXlKQJuxxJ74zIGOVPK8Xy/pihEFPJv E2cw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=NpXO1rMSILS51OGOU0gRtDFjZLO5oex+s9EREWoJc6E=; b=AWU0rx4oG2D/it/WR7d4u1k6SjA75M/u10ttTfvQ+3WnDYf+83S5wDHU2qYZx+q/XQ vLpM7+FdAopALVZwx7WPnh1lLRbmdqaaK3VCPUU9i/qjhtKY+kbFFZkyPbEhmLtQraqg mFdvHF+omKS5J0MnDdHQNWjL5TlAKzgxHyS9m+/jsfJv5cJSQ3vxUTGkhglcG8L/VsZT XgCVecpaSgmDeNwsi5V9/lnYlzaXOUpajd249D+xd7TAzXH28hO8zkePNymmqRDv/tlM ZZWu14NI/B6KE2euS4O/2jdfvqh0km25W9X1rcs4JwnGNcHeZZcDgyk+1Z0hZk2f7kml wHvA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=qKRGxeWj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id u12-20020a62790c000000b0056c01ece001si167508pfc.252.2022.10.24.09.57.50; Mon, 24 Oct 2022 09:58:07 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=qKRGxeWj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235286AbiJXQyY (ORCPT + 99 others); Mon, 24 Oct 2022 12:54:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34922 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235485AbiJXQtp (ORCPT ); Mon, 24 Oct 2022 12:49:45 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 63C742035D; Mon, 24 Oct 2022 08:33:08 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 2DA4DB8124B; Mon, 24 Oct 2022 12:06:29 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7ECB0C433C1; Mon, 24 Oct 2022 12:06:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666613187; bh=VInNq3pcofEXsFY2ZYXBIzpHnG2nDAIZc7FLbTxJPsQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qKRGxeWjPxS6dvCMNBI83+t9l3C2dMSB3Io1nkzVSZZ2jAUthr8IkFwWf1kGfiQkR pcnX+Va+YayA6PHOqCVNwGdmYRn+5HqG5SeML488JaMW6+2BjOGt7y6gBoBE1er3Ja yp0GoBIIQydGEzMJCQOt13KLfDaYzk9B6jGFdw5w= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, stable@kernel.org, Baokun Li , Jan Kara , Theodore Tso Subject: [PATCH 5.4 042/255] ext4: fix null-ptr-deref in ext4_write_info Date: Mon, 24 Oct 2022 13:29:12 +0200 Message-Id: <20221024113003.831687683@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113002.471093005@linuxfoundation.org> References: <20221024113002.471093005@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747588939839704226?= X-GMAIL-MSGID: =?utf-8?q?1747588939839704226?= From: Baokun Li commit f9c1f248607d5546075d3f731e7607d5571f2b60 upstream. I caught a null-ptr-deref bug as follows: ================================================================== KASAN: null-ptr-deref in range [0x0000000000000068-0x000000000000006f] CPU: 1 PID: 1589 Comm: umount Not tainted 5.10.0-02219-dirty #339 RIP: 0010:ext4_write_info+0x53/0x1b0 [...] Call Trace: dquot_writeback_dquots+0x341/0x9a0 ext4_sync_fs+0x19e/0x800 __sync_filesystem+0x83/0x100 sync_filesystem+0x89/0xf0 generic_shutdown_super+0x79/0x3e0 kill_block_super+0xa1/0x110 deactivate_locked_super+0xac/0x130 deactivate_super+0xb6/0xd0 cleanup_mnt+0x289/0x400 __cleanup_mnt+0x16/0x20 task_work_run+0x11c/0x1c0 exit_to_user_mode_prepare+0x203/0x210 syscall_exit_to_user_mode+0x5b/0x3a0 do_syscall_64+0x59/0x70 entry_SYSCALL_64_after_hwframe+0x44/0xa9 ================================================================== Above issue may happen as follows: ------------------------------------- exit_to_user_mode_prepare task_work_run __cleanup_mnt cleanup_mnt deactivate_super deactivate_locked_super kill_block_super generic_shutdown_super shrink_dcache_for_umount dentry = sb->s_root sb->s_root = NULL <--- Here set NULL sync_filesystem __sync_filesystem sb->s_op->sync_fs > ext4_sync_fs dquot_writeback_dquots sb->dq_op->write_info > ext4_write_info ext4_journal_start(d_inode(sb->s_root), EXT4_HT_QUOTA, 2) d_inode(sb->s_root) s_root->d_inode <--- Null pointer dereference To solve this problem, we use ext4_journal_start_sb directly to avoid s_root being used. Cc: stable@kernel.org Signed-off-by: Baokun Li Reviewed-by: Jan Kara Link: https://lore.kernel.org/r/20220805123947.565152-1-libaokun1@huawei.com Signed-off-by: Theodore Ts'o Signed-off-by: Greg Kroah-Hartman --- fs/ext4/super.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -5836,7 +5836,7 @@ static int ext4_write_info(struct super_ handle_t *handle; /* Data block + inode block */ - handle = ext4_journal_start(d_inode(sb->s_root), EXT4_HT_QUOTA, 2); + handle = ext4_journal_start_sb(sb, EXT4_HT_QUOTA, 2); if (IS_ERR(handle)) return PTR_ERR(handle); ret = dquot_commit_info(sb, type);