From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 45F5AC04E69 for ; Sun, 13 Aug 2023 15:50:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231710AbjHMPuO (ORCPT ); Sun, 13 Aug 2023 11:50:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55360 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231664AbjHMPt5 (ORCPT ); Sun, 13 Aug 2023 11:49:57 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 304A51726; Sun, 13 Aug 2023 08:49:55 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id BEED763178; Sun, 13 Aug 2023 15:49:54 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6B465C433BB; Sun, 13 Aug 2023 15:49:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1691941794; bh=JmSDlsRGpwsI4Td2KsQiUomvDh4Z7/CkAhiEgh5UJwk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=f3I5ye0ZgRviSAwaJx39v8n17U0DuQPPRFodDjSiFYl5CNHIKtsN4aHxnd3i22ZQp h5En2Q8geIhiKdXhsA0swgovXVOZ6ZW8udrRnZvwQfMOj/9YUOUczascKUWon17/k9 sEmyFsOFo/l+7BdznVQVMCbr6fH0OrH1BW4GQN3ohCLdAIHXiyisAs9Xaf2zjqN2nc Fg9EMKMw+oCZjCcsGiZKNCbDLD5hCFwUoLGz0jFgN8XyaCszr4VzR8YcM/dUyQoW/V iCvyzv8SbO9xOachKTlQUidz6yIw+3t6LuYnMlVjYdRpAqbX9UYyM5h/fA5uP/9OtN mhX/xu+sIJcBQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Namjae Jeon , zdi-disclosures@trendmicro.com, Steve French , Sasha Levin , sfrench@samba.org, linux-cifs@vger.kernel.org Subject: [PATCH AUTOSEL 6.4 11/54] ksmbd: fix out of bounds in smb3_decrypt_req() Date: Sun, 13 Aug 2023 11:48:50 -0400 Message-Id: <20230813154934.1067569-11-sashal@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230813154934.1067569-1-sashal@kernel.org> References: <20230813154934.1067569-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.4.10 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org From: Namjae Jeon [ Upstream commit dc318846f3dd54574a36ae97fc8d8b75dd7cdb1e ] smb3_decrypt_req() validate if pdu_length is smaller than smb2_transform_hdr size. Reported-by: zdi-disclosures@trendmicro.com # ZDI-CAN-21589 Signed-off-by: Namjae Jeon Signed-off-by: Steve French Signed-off-by: Sasha Levin --- fs/smb/server/smb2pdu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fs/smb/server/smb2pdu.c b/fs/smb/server/smb2pdu.c index 1cc336f512851..bd3da6cc6a98e 100644 --- a/fs/smb/server/smb2pdu.c +++ b/fs/smb/server/smb2pdu.c @@ -8611,7 +8611,8 @@ int smb3_decrypt_req(struct ksmbd_work *work) struct smb2_transform_hdr *tr_hdr = smb2_get_msg(buf); int rc = 0; - if (buf_data_size < sizeof(struct smb2_hdr)) { + if (pdu_length < sizeof(struct smb2_transform_hdr) || + buf_data_size < sizeof(struct smb2_hdr)) { pr_err("Transform message is too small (%u)\n", pdu_length); return -ECONNABORTED; -- 2.40.1