From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AE9CC33CE9A; Fri, 9 Jan 2026 12:05:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767960334; cv=none; b=D+5iT9A4dzB9aKP8ViwVdChRRuDs1fkEjPDyDYNCWimmzfKJv0dnUdalbxPNXXTEzMdUxppGlLzB8HuOiJK+T2y2TqPKzDZRq3Hy8Z9VRRoukZnApx1bko2cskU6z/TOX68NbMKtPBey3ICQ8Tu6+MlGTFoT7miskwhg6V5I8I0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767960334; c=relaxed/simple; bh=WS096ypEDK1d9d6qsQpZOyYsC1oEJ/PoYv+ELErPHOE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KCSLSF2lJPD8KApXNtnEcRm5BhE/aD0dsfszrIX7JlXcCmB7OZTfijRJU/KCK+YXiYrA2uCzmXdxhqAEpguvQlzO00Y9cSVl+l4h13JyZEga/3EWn19/d4D+WSEtkRWZhgRsyBf3gVfYK6TYyDh7kt8iCvCFdH2ZUmg6UApSlX8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=cusZN4YC; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="cusZN4YC" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3C622C4CEF1; Fri, 9 Jan 2026 12:05:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1767960334; bh=WS096ypEDK1d9d6qsQpZOyYsC1oEJ/PoYv+ELErPHOE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cusZN4YC+ElxqfBBkjsKQycnl56qeBke2tOtYh5VGnKo3VhRG+eLf393nLoBpx7R2 A61eTWAcwEUaPe8iCvxqNvA6dEDRCSjwhw3KdHCnVvPmftCiMuBKh6EKUQZHc8BxfG 2KVHoms1HHLru+cBgM7GfPp2hNDcNV3/vqseY7wM= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Thomas Fourier , Jack Wang , Jens Axboe , Sasha Levin Subject: [PATCH 6.6 368/737] block: rnbd-clt: Fix leaked ID in init_dev() Date: Fri, 9 Jan 2026 12:38:27 +0100 Message-ID: <20260109112147.838566397@linuxfoundation.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260109112133.973195406@linuxfoundation.org> References: <20260109112133.973195406@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Thomas Fourier [ Upstream commit c9b5645fd8ca10f310e41b07540f98e6a9720f40 ] If kstrdup() fails in init_dev(), then the newly allocated ID is lost. Fixes: 64e8a6ece1a5 ("block/rnbd-clt: Dynamically alloc buffer for pathname & blk_symlink_name") Signed-off-by: Thomas Fourier Acked-by: Jack Wang Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- drivers/block/rnbd/rnbd-clt.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/drivers/block/rnbd/rnbd-clt.c b/drivers/block/rnbd/rnbd-clt.c index b0550b68645d..0c3c63cf986b 100644 --- a/drivers/block/rnbd/rnbd-clt.c +++ b/drivers/block/rnbd/rnbd-clt.c @@ -1440,9 +1440,11 @@ static struct rnbd_clt_dev *init_dev(struct rnbd_clt_session *sess, goto out_alloc; } - ret = ida_alloc_max(&index_ida, (1 << (MINORBITS - RNBD_PART_BITS)) - 1, - GFP_KERNEL); - if (ret < 0) { + dev->clt_device_id = ida_alloc_max(&index_ida, + (1 << (MINORBITS - RNBD_PART_BITS)) - 1, + GFP_KERNEL); + if (dev->clt_device_id < 0) { + ret = dev->clt_device_id; pr_err("Failed to initialize device '%s' from session %s, allocating idr failed, err: %d\n", pathname, sess->sessname, ret); goto out_queues; @@ -1451,10 +1453,9 @@ static struct rnbd_clt_dev *init_dev(struct rnbd_clt_session *sess, dev->pathname = kstrdup(pathname, GFP_KERNEL); if (!dev->pathname) { ret = -ENOMEM; - goto out_queues; + goto out_ida; } - dev->clt_device_id = ret; dev->sess = sess; dev->access_mode = access_mode; dev->nr_poll_queues = nr_poll_queues; @@ -1470,6 +1471,8 @@ static struct rnbd_clt_dev *init_dev(struct rnbd_clt_session *sess, return dev; +out_ida: + ida_free(&index_ida, dev->clt_device_id); out_queues: kfree(dev->hw_queues); out_alloc: -- 2.51.0