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 D0E7D126C18; Wed, 5 Feb 2025 13:51:02 +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=1738763462; cv=none; b=jCQBXqx07ZlbWSF/cyAVOudFoy7tMiwWzHwiDQQwR7RpRpJLOO7+egOjjt2n8brjpxpOsHfmHCE4qtiVQRPzcOTPUZAmRJz2l7C0it5pBNQnbO1VctB1TYlk7Mns/NbFEWneQVvNlUTrg4Rc1gegiFfnVdkVMJCKGkOZVXMHxUw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738763462; c=relaxed/simple; bh=rfuwMxO9LaZWt5SrvTe33m8oUKtamFeuK/4wuKRHCgg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=S5e6nBjIlzgaqoDVCwTvcbNIE9Py0RSdosqcCT4PNS5JzAoQS5mW69aFr2OVRauP3Adyu0FAz90vw7GezJxrzDDCvptaX1IgJFOkNPleinPxYVI47Pe7GLZDIGxVMjxi3xuystBm+87Z4l7oKUaageVzQyffPeKcxe3NzsNSNHI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=BWqhaBfU; 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="BWqhaBfU" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 37A59C4CED1; Wed, 5 Feb 2025 13:51:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1738763462; bh=rfuwMxO9LaZWt5SrvTe33m8oUKtamFeuK/4wuKRHCgg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BWqhaBfUUZnVEgX5P1uoQWR7OPVJNwrljIvBMjKxssR89Hm+h06WLzkvUr5I8qClD SMHk0guQBQTBnN1fkynwY6+iHYOHthPNt2xAjzjndBkzum6PHYcp5lGh5PNUff58ur pY34zvhLY7IMFuOOvkrHokXJPF1EfU05xKDIKkAs= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Keisuke Nishimura , Christoph Hellwig , Sagi Grimberg , Keith Busch , Sasha Levin Subject: [PATCH 6.12 017/590] nvme: Add error check for xa_store in nvme_get_effects_log Date: Wed, 5 Feb 2025 14:36:12 +0100 Message-ID: <20250205134455.900114901@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250205134455.220373560@linuxfoundation.org> References: <20250205134455.220373560@linuxfoundation.org> User-Agent: quilt/0.68 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.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Keisuke Nishimura [ Upstream commit ac32057acc7f3d7a238dafaa9b2aa2bc9750080e ] The xa_store() may fail due to memory allocation failure because there is no guarantee that the index csi is already used. This fix adds an error check of the return value of xa_store() in nvme_get_effects_log(). Fixes: 1cf7a12e09aa ("nvme: use an xarray to lookup the Commands Supported and Effects log") Signed-off-by: Keisuke Nishimura Reviewed-by: Christoph Hellwig Reviewed-by: Sagi Grimberg Signed-off-by: Keith Busch Signed-off-by: Sasha Levin --- drivers/nvme/host/core.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index 249914b90dbfa..f5ea15bfe6feb 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -3085,7 +3085,7 @@ int nvme_get_log(struct nvme_ctrl *ctrl, u32 nsid, u8 log_page, u8 lsp, u8 csi, static int nvme_get_effects_log(struct nvme_ctrl *ctrl, u8 csi, struct nvme_effects_log **log) { - struct nvme_effects_log *cel = xa_load(&ctrl->cels, csi); + struct nvme_effects_log *old, *cel = xa_load(&ctrl->cels, csi); int ret; if (cel) @@ -3102,7 +3102,11 @@ static int nvme_get_effects_log(struct nvme_ctrl *ctrl, u8 csi, return ret; } - xa_store(&ctrl->cels, csi, cel, GFP_KERNEL); + old = xa_store(&ctrl->cels, csi, cel, GFP_KERNEL); + if (xa_is_err(old)) { + kfree(cel); + return xa_err(old); + } out: *log = cel; return 0; -- 2.39.5