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 304F92BEFED; Wed, 4 Feb 2026 15:16:06 +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=1770218166; cv=none; b=KcxVWzYPH6+rxmn11qY88XToMH8OUNTIcDaalXQFeHDtvHmF7jzUYbiZAzzlr0Hm5aA/HenTvP/M3bP6MSpoIm/V4hyDkJgJuQS2Lese4bDAefBiGE6fPFBcySXKHLOwQlOTHqyOmMkt1uDyWIdLihZfZcKrqgPcLXN56/bgsik= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770218166; c=relaxed/simple; bh=8rGPeXRFILS8TeBfSerupNifSxFdc84nZau9x6lDx/o=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VKVk3fxPUNLQ7GHwVSgp2ONdycAejpPzS5T0AihmIhrqQfbCNM63bfU1C1HQrUMW6TdyweLqKkdJ9yvQ4gCJw7GJJkViwb7uzNmxxD3RBb20CXjvo0V9kk5P3D8p9dteKkkZdW4bOcRnLmdYRXVajLFPJuPrjutjwUG67T4voBY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=U+u8/9Ec; 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="U+u8/9Ec" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 95632C4CEF7; Wed, 4 Feb 2026 15:16:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1770218166; bh=8rGPeXRFILS8TeBfSerupNifSxFdc84nZau9x6lDx/o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=U+u8/9EcgQyKoxFqHXiSGE8K5d2oHh0EKkSX63RMcCJVbFAMkMybkoTcyElOLaYru grSKcnWm6my3Pl6xZ8DNoWOKIV8jCfu5OBIfWC1jBV5LvHkwoFSpaJGNTPLxHgN2UJ FT+FEUZmRk05Mhp/4hRFLJgg//EwwHscOEQWAB+Q= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Thomas Fourier , Namjae Jeon , Steve French , Sasha Levin Subject: [PATCH 6.1 230/280] ksmbd: smbd: fix dma_unmap_sg() nents Date: Wed, 4 Feb 2026 15:40:04 +0100 Message-ID: <20260204143917.897069584@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260204143909.614719725@linuxfoundation.org> References: <20260204143909.614719725@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.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Thomas Fourier [ Upstream commit 98e3e2b561bc88f4dd218d1c05890672874692f6 ] The dma_unmap_sg() functions should be called with the same nents as the dma_map_sg(), not the value the map function returned. Fixes: 0626e6641f6b ("cifsd: add server handler for central processing and tranport layers") Cc: Signed-off-by: Thomas Fourier Acked-by: Namjae Jeon Signed-off-by: Steve French [ Context ] Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- fs/smb/server/transport_rdma.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) --- a/fs/smb/server/transport_rdma.c +++ b/fs/smb/server/transport_rdma.c @@ -1103,14 +1103,12 @@ static int get_sg_list(void *buf, int si static int get_mapped_sg_list(struct ib_device *device, void *buf, int size, struct scatterlist *sg_list, int nentries, - enum dma_data_direction dir) + enum dma_data_direction dir, int *npages) { - int npages; - - npages = get_sg_list(buf, size, sg_list, nentries); - if (npages < 0) + *npages = get_sg_list(buf, size, sg_list, nentries); + if (*npages < 0) return -EINVAL; - return ib_dma_map_sg(device, sg_list, npages, dir); + return ib_dma_map_sg(device, sg_list, *npages, dir); } static int post_sendmsg(struct smb_direct_transport *t, @@ -1179,12 +1177,13 @@ static int smb_direct_post_send_data(str for (i = 0; i < niov; i++) { struct ib_sge *sge; int sg_cnt; + int npages; sg_init_table(sg, SMB_DIRECT_MAX_SEND_SGES - 1); sg_cnt = get_mapped_sg_list(t->cm_id->device, iov[i].iov_base, iov[i].iov_len, sg, SMB_DIRECT_MAX_SEND_SGES - 1, - DMA_TO_DEVICE); + DMA_TO_DEVICE, &npages); if (sg_cnt <= 0) { pr_err("failed to map buffer\n"); ret = -ENOMEM; @@ -1192,7 +1191,7 @@ static int smb_direct_post_send_data(str } else if (sg_cnt + msg->num_sge > SMB_DIRECT_MAX_SEND_SGES) { pr_err("buffer not fitted into sges\n"); ret = -E2BIG; - ib_dma_unmap_sg(t->cm_id->device, sg, sg_cnt, + ib_dma_unmap_sg(t->cm_id->device, sg, npages, DMA_TO_DEVICE); goto err; }