From patchwork Fri Feb 3 04:09:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zheng Wang X-Patchwork-Id: 52301 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp638927wrn; Thu, 2 Feb 2023 20:33:01 -0800 (PST) X-Google-Smtp-Source: AK7set+XlNBHVUjKb2Z0JPd2aQasrcNVLNSj/P9AbNfW12jOeTXmg0QIBreCnd9aW4A4p88kk6LK X-Received: by 2002:a17:90b:4f87:b0:230:6fcb:41ce with SMTP id qe7-20020a17090b4f8700b002306fcb41cemr1788894pjb.5.1675398781235; Thu, 02 Feb 2023 20:33:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675398781; cv=none; d=google.com; s=arc-20160816; b=UIdjXAQxpvqXUYqlmuUePhppLVg9CKIcM87SsGflk0J9kcph4A8wvCx5ai2vs+WXsC Hn+svEMWwbMWwze30QRx8gUqeWc3gXVpyal+PwSmqmAt0ndWdm0Q5okKPSRT4KGZ+nP7 XCtDXi/SIohfXExNuqbr0wHyxajMVPuE71XgzWH/0ny7F3UKB+Zej7t8rmTKwuG9l6Zz ICDUKfJpzacMny3CJddC2SJYqAz75x8snfhiOQpjGYh0Q5kvIlbSYeDs5H22ISSDPj6p tS/WAJiyuBC+WBoX7gv0i78g6ZmllfraZmeaexM+Nr5fhUJ6Vhk1l00Cq55uEvMncI0t P81g== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=eP1j+lElSPssDtSj8LwargtGGcq1VDnKNYy6CzlJ97A=; b=oR1p60Kahmb7WygOwNEzwr3Fou8scNL8DukMaceovXdhHFGLkaqZGgTzfTwi4HCpKC zNPi/RoXr3faCk1/mbjMq7t65n1y9dIC0D9yyOx2sBnRVeUfxaZFODAD34j9CksrT3oC JQzuiPsSEHHQ7l8vvbYGg00buqiD5TrUZylP/TgDd7S/2A3n2dpkXwZBprpbIJ5fkPN7 y+k86JZoX2XpFlrjVZMwwNxhDNn6jhhGsneiI8y2N17smVy8steVJBpWoFo8O5bYj/bb ayM1vayNQ3F56kTOlJzHeJ5qfwcIXB+0KuntTjbCYa6YUHcZioj+X5qRwpNqNzCoEdlQ AL9Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@163.com header.s=s110527 header.b=U0SkCvWV; 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=163.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id o20-20020a637e54000000b004e05c11538csi1598637pgn.49.2023.02.02.20.32.48; Thu, 02 Feb 2023 20:33:01 -0800 (PST) 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=@163.com header.s=s110527 header.b=U0SkCvWV; 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=163.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232005AbjBCEJ6 (ORCPT + 99 others); Thu, 2 Feb 2023 23:09:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44566 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230094AbjBCEJ4 (ORCPT ); Thu, 2 Feb 2023 23:09:56 -0500 X-Greylist: delayed 5764 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Thu, 02 Feb 2023 20:09:53 PST Received: from m12.mail.163.com (m12.mail.163.com [220.181.12.216]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 6C83D88CC7; Thu, 2 Feb 2023 20:09:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=eP1j+ lElSPssDtSj8LwargtGGcq1VDnKNYy6CzlJ97A=; b=U0SkCvWVLZ7Agp2Z1bCnX hJQM4BxYzBNcDq+INaq6q0N4/3/++5o3HSxYyqddAgo+W5uQnubtr1ZqeJcIS0VP e+EsYCmoQZCBm8RZtJRC5tbAhRNNTlSx+F+WH5C5Nw1Dm2E5rH6aNi+tV1n1c5jv pBqTSpRuQW3lXeSO3fjL0I= Received: from leanderwang-LC2.localdomain (unknown [111.206.145.21]) by zwqz-smtp-mta-g0-1 (Coremail) with SMTP id _____wDXeqAFidxjvnijCg--.55564S2; Fri, 03 Feb 2023 12:09:41 +0800 (CST) From: Zheng Wang To: colyli@suse.de Cc: hackerzheng666@gmail.com, kent.overstreet@gmail.com, linux-bcache@vger.kernel.org, linux-kernel@vger.kernel.org, alex000young@gmail.com, Zheng Wang , stable@vger.kernel.org Subject: [PATCH v3] bcache: Fix __bch_btree_node_alloc to make the failure behavior consistent Date: Fri, 3 Feb 2023 12:09:40 +0800 Message-Id: <20230203040940.580903-1-zyytlz.wz@163.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-CM-TRANSID: _____wDXeqAFidxjvnijCg--.55564S2 X-Coremail-Antispam: 1Uf129KBjvJXoW7WrWfCr45Kw47XFWDuF4DArb_yoW8JFWUpF W2gryFyF4Fgr4UAas3W3WjvFyrZ34jvFWYkas3Zw1FvrnrZrn3XFWjy3y0v345CFW8GF47 Jr1rtw18Zr1jkF7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0ziaiiDUUUUU= X-Originating-IP: [111.206.145.21] X-CM-SenderInfo: h2113zf2oz6qqrwthudrp/1tbiXAkLU1Xl5gPspwAAsT X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,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?1756782952279546929?= X-GMAIL-MSGID: =?utf-8?q?1756782952279546929?= In some specific situation, the return value of __bch_btree_node_alloc may be NULL. This may lead to poential NULL pointer dereference in caller function like a calling chaion : btree_split->bch_btree_node_alloc->__bch_btree_node_alloc. Fix it by initialize return value in __bch_btree_node_alloc before return. Fixes: cafe56359144 ("bcache: A block layer cache") Cc: stable@vger.kernel.org Signed-off-by: Zheng Wang --- v3: - Add Cc: stable@vger.kernel.org suggested by Eric v2: - split patch v1 into two patches to make it clearer suggested by Coly Li --- drivers/md/bcache/btree.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/md/bcache/btree.c b/drivers/md/bcache/btree.c index 147c493a989a..cae25e74b9e0 100644 --- a/drivers/md/bcache/btree.c +++ b/drivers/md/bcache/btree.c @@ -1090,10 +1090,12 @@ struct btree *__bch_btree_node_alloc(struct cache_set *c, struct btree_op *op, struct btree *parent) { BKEY_PADDED(key) k; - struct btree *b = ERR_PTR(-EAGAIN); + struct btree *b; mutex_lock(&c->bucket_lock); retry: + /* return ERR_PTR(-EAGAIN) when it fails */ + b = ERR_PTR(-EAGAIN); if (__bch_bucket_alloc_set(c, RESERVE_BTREE, &k.key, wait)) goto err;