Skip to contentSkip to conversation

ksmbd: Fix an error handling path in 'smb2_sess_setup()'

PATCH Superseded Namjae Jeon 1 participant 1 message Nov 28, 2021 Stable branch

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Namjae Jeon

author
#0 lore raw

PATCH 1/1 ksmbd: Fix an error handling path in 'smb2_sess_setup()'

From: Christophe JAILLET <[email protected]>

All the error handling paths of 'smb2_sess_setup()' end to 'out_err'.

All but the new error handling path added by the commit given in the Fixes tag below.

Fix this error handling path and branch to 'out_err' as well.

Fixes 0d994cd482ee ("ksmbd: add buffer validation in session setup")
Cc [email protected] # v5.15
Acked-by Namjae Jeon <[email protected]>
Signed-off-by Christophe JAILLET <[email protected]>
---
 fs/ksmbd/smb2pdu.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
fs/ksmbd/smb2pdu.c +4 -2
index 589694af4e95..9ae1d19ebc38 100644
@@ -1700,8 +1700,10 @@ int smb2_sess_setup(struct ksmbd_work *work)
 	negblob_off = le16_to_cpu(req->SecurityBufferOffset);
 	negblob_len = le16_to_cpu(req->SecurityBufferLength);
 	if (negblob_off < (offsetof(struct smb2_sess_setup_req, Buffer) - 4) ||
-	    negblob_len < offsetof(struct negotiate_message, NegotiateFlags))
-		return -EINVAL;
+	    negblob_len < offsetof(struct negotiate_message, NegotiateFlags)) {
+		rc = -EINVAL;
+		goto out_err;
+	}
 
 	negblob = (struct negotiate_message *)((char *)&req->hdr.ProtocolId +
 			negblob_off);
Signature · 1 line
2.25.1