Received: by 2002:a05:6358:1087:b0:cb:c9d3:cd90 with SMTP id j7csp7360267rwi; Mon, 24 Oct 2022 13:31:13 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5li8kgULzG9p3OmuoomNr2QYiPmyUWkRsuKC1ArVQxbQeyAr1mG/JLK4BSE8bFN22q3cq1 X-Received: by 2002:a17:906:4783:b0:780:5be5:c81b with SMTP id cw3-20020a170906478300b007805be5c81bmr29777438ejc.76.1666643462511; Mon, 24 Oct 2022 13:31:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666643462; cv=none; d=google.com; s=arc-20160816; b=q/l/SJzNzuI1eKRjN2MchEdQlSHnpi3TpY775ByW5jJdcFtwqigyNQTzR48pXJEOqa htGmTQieHRaKLX3KvH0dWEIPq1rdffEUww5chLrh0qxcojzMHSGT1RDVHHkQ+VtmcqXk w1Hah8dE580prrEyfjil8byF1bOUOdFelWIsHoOsLL5eGLYCO3su3MKHFQbCOSKRh4YH kfJHFAj1UyO8Zayk6F9xm0sDYUOMDc1Rty4iirPYl7AQYxH8m9raO2mXzqGDT175BW7+ lnbZq6mX39ticpwi9l+9RNmQ9LjXnUeJJXmeiSDlE2Aspu2DcLNEIhzFa4ZXkHlSta8x um+A== 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=fMYU8jbmrpysg4cZcKs3becp28r18LPAOJGDGVc5xfw=; b=hEnDEX0UWdX64LyghkVKDBjDGIhli/UxI2R0UjasJWIZM+Wv4OxWZqtfEdmU3FUJtW 0HIilMNDO5hkizM6gX207l+D8q9twdNd6Cx4GB+wks2GEj4Vubx5IZofzi/FCbvDk54F JcZz64xp8cg45tNKyYnfb3r2LKVwZoZvJMv1XBT85idwNBg8REra1mdwW1YwH+wEAuKj 8CiRLyA83C/4PNdGP/g/ZBoZBR6wybmBDM0K9uA6ioOhj/+aUaoNqrtD82uOQVwQA10C 4ilK1oMUWPyETOTykN+SXZGaX50FJlNyuWZ13G8penWxzU9d/ZKKC/Txwr25S1/c6hgm cCJg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=i21U5CYi; 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 Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id dm5-20020a170907948500b00791a5f0b140si579544ejc.993.2022.10.24.13.30.37; Mon, 24 Oct 2022 13:31:02 -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=i21U5CYi; 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 S233477AbiJXT7v (ORCPT + 99 others); Mon, 24 Oct 2022 15:59:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41832 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234249AbiJXT7e (ORCPT ); Mon, 24 Oct 2022 15:59:34 -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 35B4114D1C9; Mon, 24 Oct 2022 11:22: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 B99EBB818D1; Mon, 24 Oct 2022 12:37:09 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1CD85C433C1; Mon, 24 Oct 2022 12:37:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666615028; bh=H/59EyFRhkIzUXpuR7LWGJ/wuQiUg9qp+fAjiNamP8k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=i21U5CYiMbr58oNrP9AQoSKVr2kAxwoEm5Kz2JIpMbNdypIR/fOUtZl6fpC3REDvN IHi+BwozeZL7fdvoTp4dN8EBulbXW4k9dl27RyUOztQKTjSe9U8YSrnxGRVricIrFp LuEuwCSTt5UD/DN0fFhcIXBj5mAOk0fdmRdBfA6Q= 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.15 093/530] ext4: fix null-ptr-deref in ext4_write_info Date: Mon, 24 Oct 2022 13:27:17 +0200 Message-Id: <20221024113049.223982172@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113044.976326639@linuxfoundation.org> References: <20221024113044.976326639@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 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 @@ -6207,7 +6207,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);