From patchwork Wed Oct 19 08:23:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 4562 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp204738wrs; Wed, 19 Oct 2022 01:47:09 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7VvR48RudNw+EOKK2sf5W/NpSNIFY8Sn/VjXtHBKyQ3zGNXy9AVx48BMzF5XZYY+b9Cr5W X-Received: by 2002:a17:902:ab06:b0:180:556e:1b5e with SMTP id ik6-20020a170902ab0600b00180556e1b5emr7381433plb.93.1666169229019; Wed, 19 Oct 2022 01:47:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666169229; cv=none; d=google.com; s=arc-20160816; b=klcXQYlJphqgSp3lTD9RlZ+J3JiEG5UOBtryBalKbcddpM4bE1ob0JBlZ24noaIMqQ fttCy/UG7IJtHoZ5CDWnb7cpa4ULtdLEhlQ0sqyEs6sX6rDXaxWPlWZkRAV18+v/mTKr HEeAB0mNWIZBiqwH4sIVqtOLYGrsAKsR1tu0s8YCLpF/U43ALAxutV0vOquHMF7n9XDT 2z/ygIzVZ9yRx08lqy/THENtzfcmYNZ14Y+1U8nH9OYBEe0x9VJAZaZ1qIZ7dv2fDt4L uzr/jwbfDMRz/piJmPDP+v+k3oMALRKp9gGJG0uSWpe0j38ZeiD2ZNKwFj3gzc7gJtzd U7nw== 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=PpMoXHykFRnqMYpjBBc4HYeQQ2aavHS29tDW0qP1RoE=; b=ATuwMYeLzzEGWj0moKEzjlxBzJuC6VMUu/PzkoC1TGL/nCaYM/Ak7y633jAYdUTJy/ IJgXoEWeTZ+n+CJ6ZtFj3RiAXIG/VaCGtGX96yf0ucj6SeGhqes7E5Fd1VyOrcJBt8Ad Sx9XS49cVe41o7J9v+sKMBjIaG9+ttUlBbLVQmkAVijw5J1ekBIfAyvedMZX5ggFnR2N NPF5ZhVGfjwxi8/kNcURuv8rpXieXhf6xix1TgdNK1xE/jmJAsFQyKf+JIGZ9pbz2tnC 42aQ9FJmzG7HY0KKd/2E6LRK7t8WyF3CwO/CLDixsaA1niDlc6uw5ngSkJRVTw/504aw ccCw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=qDNeQbmK; 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 p2-20020a170902f08200b0017e733a15b6si15607191pla.286.2022.10.19.01.46.47; Wed, 19 Oct 2022 01:47:09 -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=qDNeQbmK; 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 S231511AbiJSIqa (ORCPT + 99 others); Wed, 19 Oct 2022 04:46:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42878 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231310AbiJSIo5 (ORCPT ); Wed, 19 Oct 2022 04:44:57 -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 48D0B89831; Wed, 19 Oct 2022 01:43:47 -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 D30AB61808; Wed, 19 Oct 2022 08:43:40 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CC937C433D6; Wed, 19 Oct 2022 08:43:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666169020; bh=UglnOpSZq1r0SanQA9k9gKkp/CJxtHsfjA+Q6Eod9qg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qDNeQbmKKIum8sHJRd0vxVEL6V836ZW8TNuFxFb9KUqbMJZQK/Aj+HpDEZ2Pl3h02 g4MMO5AJc9SF/trqJz0vf/DwjeNqDHYNlHdyahmnlasQ2SPGgf1y7g8MeOPmx/zSgX vdH//FlgVLxISsmQk1XFbIBpbwrqWS4kcDk+E3v0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, stable@kernel.org, Ye Bin , Jan Kara , Theodore Tso Subject: [PATCH 6.0 131/862] jbd2: fix potential buffer head reference count leak Date: Wed, 19 Oct 2022 10:23:38 +0200 Message-Id: <20221019083255.772010170@linuxfoundation.org> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221019083249.951566199@linuxfoundation.org> References: <20221019083249.951566199@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.4 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?1747105065579530227?= X-GMAIL-MSGID: =?utf-8?q?1747105065579530227?= From: Ye Bin commit e0d5fc7a6d80ac2406c7dfc6bb625201d0250a8a upstream. As in 'jbd2_fc_wait_bufs' if buffer isn't uptodate, will return -EIO without update 'journal->j_fc_off'. But 'jbd2_fc_release_bufs' will release buffer head from ‘j_fc_off - 1’ if 'bh' is NULL will terminal release which will lead to buffer head buffer head reference count leak. To solve above issue, update 'journal->j_fc_off' before return -EIO. Cc: stable@kernel.org Signed-off-by: Ye Bin Reviewed-by: Jan Kara Link: https://lore.kernel.org/r/20220914100812.1414768-2-yebin10@huawei.com Signed-off-by: Theodore Ts'o Signed-off-by: Greg Kroah-Hartman --- fs/jbd2/journal.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) --- a/fs/jbd2/journal.c +++ b/fs/jbd2/journal.c @@ -925,8 +925,14 @@ int jbd2_fc_wait_bufs(journal_t *journal wait_on_buffer(bh); put_bh(bh); journal->j_fc_wbuf[i] = NULL; - if (unlikely(!buffer_uptodate(bh))) + /* + * Update j_fc_off so jbd2_fc_release_bufs can release remain + * buffer head. + */ + if (unlikely(!buffer_uptodate(bh))) { + journal->j_fc_off = i; return -EIO; + } } return 0;