From patchwork Sat Oct 22 07:20:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 7235 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4242:0:0:0:0:0 with SMTP id s2csp1090821wrr; Sat, 22 Oct 2022 00:48:37 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5+QZC8pqISIyaJ/OA+4BFGCONO2ULP+5ibEgMWlkmN83M34EUdMKshpoF/G4TIX0DGiX69 X-Received: by 2002:a17:90a:2bc9:b0:212:8210:c92d with SMTP id n9-20020a17090a2bc900b002128210c92dmr13178067pje.38.1666424917573; Sat, 22 Oct 2022 00:48:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666424917; cv=none; d=google.com; s=arc-20160816; b=TWkk405RfkbFEddMiW54S1YfJqbhNiGgxPCvUryzU5hHNGDnKSFqRMZtxXY/4SAnjf Iy+6a9AknwTV/X5DRrLUz+xLmZM7691r0Ipld8jymq5Aj9wayvEbXj/XB933vAr6rPQS FlwSgdEhNQBGLfBKuJ/VlONn6BPZQnURnxfiRWrBsXsc3h3CK/+NhoO4UD61zB/Zm3dH pbwjN/1xVfxZEDfAqU4RA4NHJ4TTv/KtLx4i7GmFvU+XnSSS2T7GnX/U6yCNcZ8swtpD JzzERT/eTMgJLYhJ4pLXjpnpyjNOq35ZukiD9TAaNJsRIdlEoeAJdEOGKCwlzqlYBBIb lMKA== 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=4+raWCaszlUdsTJ4RnK+FXdhcGlLxtTl9Nu3upv688k=; b=j5Mj6VrfGy/kJSqklQPai443Xh2F6Ds+bKnH3aq6K3852pT65kP1RHgtVC0ilVhh7p XcMM3xey6ZIl3y9rViIkO0I4tXKhhI30/ueEmFi7NqQh/O+ebMaAFmukfFbM7f0ssICm atCkeeSqrNfhtD2UtAGmY0PPfT9ypBA60VA07jBZOTK7xUYBd53ujpVyufr/iMWo0/vp rjHpW87kWDgrXHYrdJNjZB13mu1E/Xg3TXziWlEiXeqhuoVkvVd62hf0PC/e48u304hk 5lz3MfDpe098uJFKjmD/qO/83eD7ycYDPVNcyLrpc15yubYCUhBRC+zUZMHcAli6OAX8 l34A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=yD20IUMB; 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 k14-20020a170902ce0e00b00176c9015627si27443656plg.94.2022.10.22.00.48.25; Sat, 22 Oct 2022 00:48:37 -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=yD20IUMB; 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 S231473AbiJVHsD (ORCPT + 99 others); Sat, 22 Oct 2022 03:48:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38300 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231447AbiJVHrd (ORCPT ); Sat, 22 Oct 2022 03:47:33 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A7B5D37F9F; Sat, 22 Oct 2022 00:44:43 -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 dfw.source.kernel.org (Postfix) with ESMTPS id 481B860B3B; Sat, 22 Oct 2022 07:39:41 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 53BD5C433D6; Sat, 22 Oct 2022 07:39:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666424380; bh=KR9RihcwnwYiB/HtvfaHbTy/ZWvpYl/I0Y7UHaFuZMM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yD20IUMBy0D+apAlofvfXqx7NkgYcrZNg3nF38yBvFN+OBpK4Yd2hLZj3OQ1dY0mh xgG2eRwTEhuATXGLxauephhj+kdtO86J7BN+y8Yvi0Onyu0kIsVJL2TYSC2Oug+2q8 +d6/5G2ZzkQiIarzZVtVMwl1oX63U1tUcJ6UTuPI= 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.19 124/717] ext4: fix null-ptr-deref in ext4_write_info Date: Sat, 22 Oct 2022 09:20:03 +0200 Message-Id: <20221022072437.431554663@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221022072415.034382448@linuxfoundation.org> References: <20221022072415.034382448@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.3 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?1747373174606656596?= X-GMAIL-MSGID: =?utf-8?q?1747373174606656596?= 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 @@ -6643,7 +6643,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);