From patchwork Thu Feb 9 12:09:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Natalia Petrova X-Patchwork-Id: 54912 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp298423wrn; Thu, 9 Feb 2023 04:14:19 -0800 (PST) X-Google-Smtp-Source: AK7set+h305tv2T4814YHK3GjzZDQM9vQpKLreBnRIbtSlcoIXN95wF52HtQv8M/gQaiUU2vQety X-Received: by 2002:a17:902:f54c:b0:198:a86c:33f with SMTP id h12-20020a170902f54c00b00198a86c033fmr14671208plf.65.1675944859151; Thu, 09 Feb 2023 04:14:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675944859; cv=none; d=google.com; s=arc-20160816; b=RBowiJp1hAV9zW9qs7pSSRKiDKFOgKVVpoX2wVe3Zr3Ip4zCAzq5vwRtsIOEiNq52N ofarWHGmDtuOvJO1Xu7KToopirvTTW//9jID7H6uO0390/FxUtZFlk0sPfjIBPO933eu EW7ZGmtoqPdB/wcQSi4wV3ei3rv+oppT206erZ/CHn73wgYxGXJV7NiNTTOfbpcf7mwc 0NIhNIhJTV1Sb0RXeYE/fo+1iNEeNnz4QHkXrca9rZqlUl/wBfK4vxncip5M/Q7OrfBX D16zIxsTyCTvS4dyIGfk/Oi/KaStmGvbH8QY5L2asFJGOpWjSdXKLV7cPJi2W+KbUZva 1Sig== 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 :references:in-reply-to:message-id:date:subject:cc:to:from; bh=pbtbW06McmhZkaIfduHUBuPUbiWv8xNfa3d4HbyvSaE=; b=BKolkbPQYq0BRrDoDQ5bvI6s0838GNk6JhHvQOi9Z9mrSy5Ypb8eUA8SvxtfdvjwAY 1XQ14Qm90QmHapHr/S2thTfqX8oZ9O44orQHBCgleJnY5wyR5ocgHZ9/1r5d8fyO2mqv YCj6+ppJajijwcNpquel88U/RpK6KsXNWr6KsjUrWnndlRlz3MlfYFOIwkTEJkzMXzNF 7DhQSBl5ZB7NMLrBUmIhE5bkMyJi8hpGLQykVHL9L3SLHGdQUZq7Uq+VI6rSuePIxXBi R2APLgRZUxf4I3rOrCgGteHJseKOUSEbLm2uZqMwJ9/ylcp02OH5GqEoMKSPa0s6tIVB d7Jw== ARC-Authentication-Results: i=1; mx.google.com; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id c21-20020a170902b69500b00198ff552eeasi778798pls.539.2023.02.09.04.14.06; Thu, 09 Feb 2023 04:14:19 -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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230281AbjBIMMG (ORCPT + 99 others); Thu, 9 Feb 2023 07:12:06 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49692 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229798AbjBIMLS (ORCPT ); Thu, 9 Feb 2023 07:11:18 -0500 Received: from exchange.fintech.ru (exchange.fintech.ru [195.54.195.159]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 50E4161B4; Thu, 9 Feb 2023 04:09:29 -0800 (PST) Received: from Ex16-01.fintech.ru (10.0.10.18) by exchange.fintech.ru (195.54.195.169) with Microsoft SMTP Server (TLS) id 14.3.498.0; Thu, 9 Feb 2023 15:09:26 +0300 Received: from KANASHIN1.fintech.ru (10.0.253.125) by Ex16-01.fintech.ru (10.0.10.18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.4; Thu, 9 Feb 2023 15:09:25 +0300 From: Natalia Petrova To: Ilya Dryomov CC: Natalia Petrova , Dongsheng Yang , Jens Axboe , , , , , "Alexey Khoroshilov" , Nikita Zhandarovich Subject: [PATCH v2] rbd: fix freeing memory of 'rbd_dev->opts', 'rbd_dev->spec', 'rbd_dev->rbd_client' Date: Thu, 9 Feb 2023 15:09:23 +0300 Message-ID: <20230209120923.331111-1-n.petrova@fintech.ru> X-Mailer: git-send-email 2.34.1 In-Reply-To: <06f51bab-42e1-975a-ad4f-6815c2063adb@redhat.com> References: MIME-Version: 1.0 X-Originating-IP: [10.0.253.125] X-ClientProxiedBy: Ex16-01.fintech.ru (10.0.10.18) To Ex16-01.fintech.ru (10.0.10.18) X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,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?1757355556092187794?= X-GMAIL-MSGID: =?utf-8?q?1757355556092187794?= If the rbd_dev_create() fails after assignment 'opts' to 'rbd_dev->opts', double free of 'rbd_options' happens: one is in rbd_dev_free() and another one is in do_rbd_add(). If the rbd_dev_create() fails, for 'spec' it will be freed in rbd_dev_create()->rbd_spec_put() first and then in do_rbd_add() it will call rbd_spec_put() again. The same for 'rbd_client'. Unlike 'rbd_dev->opts', 'rbd_dev->spec' and 'rbd_dev->rbd_client' are ref-counted, that's why the ref-count underflow warning should be generated in rbd_spec_put() and rbd_put_client() to handle the return values of kref_put(). Found by Linux Verification Center (linuxtesting.org) with SVACE. Fixes: 1643dfa4c2c8 ("rbd: introduce a per-device ordered workqueue") Signed-off-by: Natalia Petrova Signed-off-by: Alexey Khoroshilov Signed-off-by: Nikita Zhandarovich --- v2: Remarks on the processing of 'rbd_dev->spec' and 'rbd_dev->rbd_client' by Ilya Dryomov and Xiubo Li were taken into account. drivers/block/rbd.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index 04453f4a319c..f3f253febe0f 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -889,8 +889,10 @@ static void rbd_client_release(struct kref *kref) */ static void rbd_put_client(struct rbd_client *rbdc) { - if (rbdc) - kref_put(&rbdc->kref, rbd_client_release); + if (rbdc) { + if (!kref_put(&rbdc->kref, rbd_client_release)) + pr_warn("The reference count underflow\n"); + } } /* @@ -5225,8 +5227,10 @@ static struct rbd_spec *rbd_spec_get(struct rbd_spec *spec) static void rbd_spec_free(struct kref *kref); static void rbd_spec_put(struct rbd_spec *spec) { - if (spec) - kref_put(&spec->kref, rbd_spec_free); + if (spec) { + if (!kref_put(&spec->kref, rbd_spec_free)) + pr_warn("The reference count underflow\n"); + } } static struct rbd_spec *rbd_spec_alloc(void) @@ -5357,7 +5361,6 @@ static struct rbd_device *rbd_dev_create(struct rbd_client *rbdc, if (!rbd_dev) return NULL; - rbd_dev->opts = opts; /* get an id and fill in device name */ rbd_dev->dev_id = ida_simple_get(&rbd_dev_id_ida, 0, @@ -5372,6 +5375,7 @@ static struct rbd_device *rbd_dev_create(struct rbd_client *rbdc, if (!rbd_dev->task_wq) goto fail_dev_id; + rbd_dev->opts = opts; /* we have a ref from do_rbd_add() */ __module_get(THIS_MODULE);