From patchwork Mon Oct 24 11:27:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 10165 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp640435wru; Mon, 24 Oct 2022 13:32:40 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6q8LW/5ySVxPOqC2HB+YmilLJ2aeAoZx83olHgTPF++GLYEiYL0wppiKCgJlReGBezDVjD X-Received: by 2002:a17:907:d10:b0:79a:a1fe:8be5 with SMTP id gn16-20020a1709070d1000b0079aa1fe8be5mr16173017ejc.125.1666643559996; Mon, 24 Oct 2022 13:32:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666643559; cv=none; d=google.com; s=arc-20160816; b=OltpODlGkVhaPPbkiMj0oTbbCixQYpR3c4Zq+6lMz+gG05bqUq4dMa2gDjn1NA+CkY OZbmcBHpQgmyxfkPBa2t+pjTBbKKiFGmAUNsGb/koDWPvpOt7NCfmUzodOX86wfQ12HD S/FgSPciK1Euci9f1WFUB2JbWKucEpnZ+S92aTHXrrVN/AeqGtzQnHc6ujTImPP/cxnj D9BhqVbO3z7WiZN5WU52VmWkeqQWOciGh3TNc62bP6bwGyGj1Pq1aRA8FfqbxOuSHC5h ypMvNMKyI+S+6Ydl+BYRrbZ0IYtbQfKNKg7lsgVHW+fbS7EI9i22+2Xc79GfPPo3X+v5 hUsA== 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=KDN0Q2R4dKq06tkiDRWSjZK+IYROnp4qZtR+qD7XMeg=; b=dVBDuEXOy9ycynkeu4i/J408ia/jTbuI9dvIw6eXugRCciwCWaIR0R47iYYXkWS8i4 KxovNC/S/n6Ff7Jy2AyWphMHivhwzs6TwYA6Ak3PAObiUwCSON1kiFb1Tz8OdSxrC2RU nV+dzt7ZGL2McPAYyieuJLWphJXV0IcU4tup35lW2bQRY74Y8yw5OQvJTG8Tww5qV1Zj 8kDaycGIhWHRStQP/jZ676jMntEkcy8MuQFxjnKUj2LM1XUxgFpv8qOGOKcDcA1yPkWF Db/GzzWZ8vNIYtoFRiroHB1Rn+a6lNOouR7mC3QcSaScHY0lTwtKwG5ND1ELWWJWyvO2 LS3g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=WCmNqjAi; 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 js17-20020a17090797d100b0078d459a1ce9si695020ejc.693.2022.10.24.13.32.15; Mon, 24 Oct 2022 13:32:39 -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=WCmNqjAi; 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 S233082AbiJXUWQ (ORCPT + 99 others); Mon, 24 Oct 2022 16:22:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33936 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234124AbiJXUVO (ORCPT ); Mon, 24 Oct 2022 16:21:14 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1DD485FF5D; Mon, 24 Oct 2022 11:37:36 -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 D78F5B815C8; Mon, 24 Oct 2022 12:18:21 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3158EC433B5; Mon, 24 Oct 2022 12:18:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666613900; bh=dQ1FrTEtjY+nOpJPZkZ19Nk4MsjhXPguPPae1bpJD18=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WCmNqjAiq/yhacwK4WXjQMwApe4Lk8xCGbEZVyQ22ioxHmOoBJzn4Eu2j+y9sbVXr hROVd/kaa8yY7qgs8uoHQS5s2Oyitpv87BEPl3UO4tGx2quHBlqc7QEHCUnri8x5qM xbL1yrGvmYMdg9nGP7wdes6H+Zxf1CsqK+EXc6YA= 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 5.10 057/390] jbd2: fix potential buffer head reference count leak Date: Mon, 24 Oct 2022 13:27:34 +0200 Message-Id: <20221024113025.065426067@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113022.510008560@linuxfoundation.org> References: <20221024113022.510008560@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?1747602437727386026?= X-GMAIL-MSGID: =?utf-8?q?1747602437727386026?= 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 @@ -926,8 +926,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;