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 2AB90C8E6; Mon, 22 Sep 2025 19:32:19 +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=1758569539; cv=none; b=QS4bAmaxL3Yj7x9TpfHF8de/SN4vepCR9v3WMs9Tfi4GO2WBPSBHUp9pAmmISbtxCFGLG6d7qCRHIh6F//I9Pl2EvQUdR8vW2JkfwaQuNlbjiI5vlITElSIO+hFimeVI9SrdpcQB+jr0r+tPRyxP5ZQFkuuId4loZz6hvYiJSwE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758569539; c=relaxed/simple; bh=ui4+WlhbiBizhLAtw1Aqy9qyj7DIKrJR0YGHeLJTWPI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OrsghCzYVYKnTewt+YjqAZwBLBfYVBxOJf1lKrutQoOTlCPzTsrRyl+T6HzqEQ5qc2cvsIdG61xTXTOxYgRl0FOBIxYII1W/34Tm0Pmqw8nCOe68RyTJicnUZufZ7f+p3zsFKJzPiA+Jf9ogYvcSsUf9FDTNgvgSXsFu8QRAtaI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=E5HoHgJB; 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="E5HoHgJB" Received: by smtp.kernel.org (Postfix) with ESMTPSA id ACB36C4CEF0; Mon, 22 Sep 2025 19:32:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1758569539; bh=ui4+WlhbiBizhLAtw1Aqy9qyj7DIKrJR0YGHeLJTWPI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=E5HoHgJBsPYCWzhxHtQzkvFTPe68weoHvGNr9YoGUhCZdFVAzmEFAwDKh9/7OqLp+ gHRKkiVA7FPfC5brCmf6q2isqueuXOA3WXz97fpTOVMNpq8r7ZC9JHNt/KET2xwAWw pkPhXbv49tg7aRE9Y5qFGp9XlHIfOpoHWCCUNcwM= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Stefan Metzmacher , "Luigino Camastra, Aisle Research" , Namjae Jeon , Steve French Subject: [PATCH 6.1 20/61] ksmbd: smbdirect: validate data_offset and data_length field of smb_direct_data_transfer Date: Mon, 22 Sep 2025 21:29:13 +0200 Message-ID: <20250922192404.103945935@linuxfoundation.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250922192403.524848428@linuxfoundation.org> References: <20250922192403.524848428@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev 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: Namjae Jeon commit 5282491fc49d5614ac6ddcd012e5743eecb6a67c upstream. If data_offset and data_length of smb_direct_data_transfer struct are invalid, out of bounds issue could happen. This patch validate data_offset and data_length field in recv_done. Cc: stable@vger.kernel.org Fixes: 2ea086e35c3d ("ksmbd: add buffer validation for smb direct") Reviewed-by: Stefan Metzmacher Reported-by: Luigino Camastra, Aisle Research Signed-off-by: Namjae Jeon Signed-off-by: Steve French Signed-off-by: Greg Kroah-Hartman --- fs/smb/server/transport_rdma.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) --- a/fs/smb/server/transport_rdma.c +++ b/fs/smb/server/transport_rdma.c @@ -548,7 +548,7 @@ static void recv_done(struct ib_cq *cq, case SMB_DIRECT_MSG_DATA_TRANSFER: { struct smb_direct_data_transfer *data_transfer = (struct smb_direct_data_transfer *)recvmsg->packet; - unsigned int data_length; + unsigned int data_offset, data_length; int avail_recvmsg_count, receive_credits; if (wc->byte_len < @@ -559,14 +559,15 @@ static void recv_done(struct ib_cq *cq, } data_length = le32_to_cpu(data_transfer->data_length); - if (data_length) { - if (wc->byte_len < sizeof(struct smb_direct_data_transfer) + - (u64)data_length) { - put_recvmsg(t, recvmsg); - smb_direct_disconnect_rdma_connection(t); - return; - } + data_offset = le32_to_cpu(data_transfer->data_offset); + if (wc->byte_len < data_offset || + wc->byte_len < (u64)data_offset + data_length) { + put_recvmsg(t, recvmsg); + smb_direct_disconnect_rdma_connection(t); + return; + } + if (data_length) { if (t->full_packet_received) recvmsg->first_segment = true;