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 913071482E8 for ; Sat, 7 Feb 2026 20:12:23 +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=1770495143; cv=none; b=gwq6dY0eCMqs2IP6lO5kSiVb9tg8jZVBv+Od98iCUIYYCE+oWKMlg8dUS/zoVh/WlmeZbhEIvwQXE/DZXsRcjqHmiYrWaoWVDywwTqzmTKe5FKMKTGFb11OyPQSNwDKRFlmurzZGcRkOdl9ihlzLl2k/Iw7lvibzDEXYPLxI93Q= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770495143; c=relaxed/simple; bh=nn2Us9YIZegIW/okw42kfhTE4CAaCZRxe+eJBNdiIv8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=aRSXXUiE0Lj6hrEk99uK2/FRzRunQB9tYrWbOmnV4KX2GeaC9YAU1DI0SreFZV4yXOrsIWfifkKC6ZZyxFj1aVH6gbKmvnMXxbHhzyeZEcbNWjIXToQKlJoIn+31cgf+1L/hJZWjohRVhp29BaeMQUwUYro+6PMEiO7UxMx6Mgk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=BI16z0RV; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="BI16z0RV" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B662AC116D0; Sat, 7 Feb 2026 20:12:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1770495143; bh=nn2Us9YIZegIW/okw42kfhTE4CAaCZRxe+eJBNdiIv8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BI16z0RVC7Lf+5I3wAPnG07ptbZ8fuRLUcE8VMO6iTc/Y2Vm72+87Sj6EdECBH5NI vPvduefBNNG2iiPyHsdnPVFIwQ78sH7ZknJ6ZQ2FV3YgHMjd+nPpRpQAB9effY8KdS H6q778TAu10XBa0/y74/U6RcbZiqvyWm1VCNSLHiHFjvCicBTSveMTv7gsvcmau+n1 AKXLyUG6Ejq3F514nCPceVP+lg1rJmXoNYfsm7JkKpvvBrJZau9YStGimJNKoBUVyo QievaqZoY0sEGWukfFVWk+LpPZ5ZoFlWPp3oHZpFY2B3eKrmyioYhOzr9cGK5lEBRh Sdy2vfOnT43XQ== From: Sasha Levin To: stable@vger.kernel.org Cc: Sagi Grimberg , Christoph Hellwig , Sasha Levin Subject: [PATCH 5.10.y 3/5] nvmet-tcp: fix regression in data_digest calculation Date: Sat, 7 Feb 2026 15:12:17 -0500 Message-ID: <20260207201219.540631-3-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260207201219.540631-1-sashal@kernel.org> References: <2026020741-chitchat-symphonic-a96f@gregkh> <20260207201219.540631-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Sagi Grimberg [ Upstream commit ed0691cf55140ce0f3fb100225645d902cce904b ] Data digest calculation iterates over command mapped iovec. However since commit bac04454ef9f we unmap the iovec before we handle the data digest, and since commit 69b85e1f1d1d we clear nr_mapped when we unmap the iov. Instead of open-coding the command iov traversal, simply call crypto_ahash_digest with the command sg that is already allocated (we already do that for the send path). Rename nvmet_tcp_send_ddgst to nvmet_tcp_calc_ddgst and call it from send and recv paths. Fixes: 69b85e1f1d1d ("nvmet-tcp: add an helper to free the cmd buffers") Fixes: bac04454ef9f ("nvmet-tcp: fix kmap leak when data digest in use") Signed-off-by: Sagi Grimberg Signed-off-by: Christoph Hellwig Stable-dep-of: 52a0a9854934 ("nvmet-tcp: add bounds checks in nvmet_tcp_build_pdu_iovec") Signed-off-by: Sasha Levin --- drivers/nvme/target/tcp.c | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/drivers/nvme/target/tcp.c b/drivers/nvme/target/tcp.c index bf34849c15a20..bc0e860a2887f 100644 --- a/drivers/nvme/target/tcp.c +++ b/drivers/nvme/target/tcp.c @@ -395,7 +395,7 @@ static int nvmet_tcp_map_data(struct nvmet_tcp_cmd *cmd) return NVME_SC_INTERNAL; } -static void nvmet_tcp_send_ddgst(struct ahash_request *hash, +static void nvmet_tcp_calc_ddgst(struct ahash_request *hash, struct nvmet_tcp_cmd *cmd) { ahash_request_set_crypt(hash, cmd->req.sg, @@ -403,23 +403,6 @@ static void nvmet_tcp_send_ddgst(struct ahash_request *hash, crypto_ahash_digest(hash); } -static void nvmet_tcp_recv_ddgst(struct ahash_request *hash, - struct nvmet_tcp_cmd *cmd) -{ - struct scatterlist sg; - struct kvec *iov; - int i; - - crypto_ahash_init(hash); - for (i = 0, iov = cmd->iov; i < cmd->nr_mapped; i++, iov++) { - sg_init_one(&sg, iov->iov_base, iov->iov_len); - ahash_request_set_crypt(hash, &sg, NULL, iov->iov_len); - crypto_ahash_update(hash); - } - ahash_request_set_crypt(hash, NULL, (void *)&cmd->exp_ddgst, 0); - crypto_ahash_final(hash); -} - static void nvmet_setup_c2h_data_pdu(struct nvmet_tcp_cmd *cmd) { struct nvme_tcp_data_pdu *pdu = cmd->data_pdu; @@ -444,7 +427,7 @@ static void nvmet_setup_c2h_data_pdu(struct nvmet_tcp_cmd *cmd) if (queue->data_digest) { pdu->hdr.flags |= NVME_TCP_F_DDGST; - nvmet_tcp_send_ddgst(queue->snd_hash, cmd); + nvmet_tcp_calc_ddgst(queue->snd_hash, cmd); } if (cmd->queue->hdr_digest) { @@ -1156,7 +1139,7 @@ static void nvmet_tcp_prep_recv_ddgst(struct nvmet_tcp_cmd *cmd) { struct nvmet_tcp_queue *queue = cmd->queue; - nvmet_tcp_recv_ddgst(queue->rcv_hash, cmd); + nvmet_tcp_calc_ddgst(queue->rcv_hash, cmd); queue->offset = 0; queue->left = NVME_TCP_DIGEST_LENGTH; queue->rcv_state = NVMET_TCP_RECV_DDGST; -- 2.51.0