FAILED: Patch "ksmbd: fix potencial out-of-bounds when buffer offset is invalid" failed to apply to 6.6-stable tree
Subsystems (3)
Sasha Levin
maintainerThe patch below does not apply to the 6.6-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
Thanks,
Sasha
------------------ original commit in Linus's tree ------------------
From c6cd2e8d2d9aa7ee35b1fa6a668e32a22a9753da Mon Sep 17 00:00:00 2001
From: Namjae Jeon <[email protected]>
Date: Tue, 19 Mar 2024 08:40:48 +0900
Subject: [PATCH] ksmbd: fix potencial out-of-bounds when buffer offset is
invalid
I found potencial out-of-bounds when buffer offset fields of a few requests is invalid. This patch set the minimum value of buffer offset field to ->Buffer offset to validate buffer length.
--- fs/smb/server/smb2misc.c | 23 +++++++++++++------ fs/smb/server/smb2pdu.c | 48 ++++++++++++++++++++++------------------ 2 files changed, 42 insertions(+), 29 deletions(-)
fs/smb/server/smb2misc.c +16 -7
@@ -101,7 +101,9 @@ static int smb2_get_data_area_len(unsigned int *off, unsigned int *len, *len =le16_to_cpu (((struct smb2_sess_setup_req *)hdr)->SecurityBufferLength);break ;case SMB2_TREE_CONNECT : - *off =le16_to_cpu (((struct smb2_tree_connect_req *)hdr)->PathOffset); + *off = max_t(unsigned short int, +le16_to_cpu (((struct smb2_tree_connect_req *)hdr)->PathOffset), + offsetof(struct smb2_tree_connect_req , Buffer)); *len =le16_to_cpu (((struct smb2_tree_connect_req *)hdr)->PathLength);break ;case SMB2_CREATE :
@@ -110,7 +112,6 @@ static int smb2_get_data_area_len(unsigned int *off, unsigned int *len, max_t(unsigned short int,le16_to_cpu (((struct smb2_create_req *)hdr)->NameOffset), offsetof(struct smb2_create_req, Buffer)); -unsigned short int name_len =le16_to_cpu (((struct smb2_create_req *)hdr)->NameLength);
@@ -131,11 +132,15 @@ static int smb2_get_data_area_len(unsigned int *off, unsigned int *len,break ; }case SMB2_QUERY_INFO : - *off =le16_to_cpu (((struct smb2_query_info_req *)hdr)->InputBufferOffset); + *off = max_t(unsigned int, +le16_to_cpu (((struct smb2_query_info_req *)hdr)->InputBufferOffset), + offsetof(struct smb2_query_info_req , Buffer)); *len =le32_to_cpu (((struct smb2_query_info_req *)hdr)->InputBufferLength);break ;case SMB2_SET_INFO : - *off =le16_to_cpu (((struct smb2_set_info_req *)hdr)->BufferOffset); + *off = max_t(unsigned int, +le16_to_cpu (((struct smb2_set_info_req *)hdr)->BufferOffset), + offsetof(struct smb2_set_info_req , Buffer)); *len =le32_to_cpu (((struct smb2_set_info_req *)hdr)->BufferLength);break ;case SMB2_READ :
@@ -145,7 +150,7 @@ static int smb2_get_data_area_len(unsigned int *off, unsigned int *len,case SMB2_WRITE :if (((struct smb2_write_req *)hdr)->DataOffset || ((struct smb2_write_req *)hdr)->Length) { - *off = max_t(unsigned int, + *off = max_t(unsigned short int,le16_to_cpu (((struct smb2_write_req *)hdr)->DataOffset), offsetof(struct smb2_write_req , Buffer)); *len =le32_to_cpu (((struct smb2_write_req *)hdr)->Length);
@@ -156,7 +161,9 @@ static int smb2_get_data_area_len(unsigned int *off, unsigned int *len, *len =le16_to_cpu (((struct smb2_write_req *)hdr)->WriteChannelInfoLength);break ;case SMB2_QUERY_DIRECTORY : - *off =le16_to_cpu (((struct smb2_query_directory_req *)hdr)->FileNameOffset); + *off = max_t(unsigned short int, +le16_to_cpu (((struct smb2_query_directory_req *)hdr)->FileNameOffset), + offsetof(struct smb2_query_directory_req , Buffer)); *len =le16_to_cpu (((struct smb2_query_directory_req *)hdr)->FileNameLength);break ;case SMB2_LOCK :
@@ -171,7 +178,9 @@ static int smb2_get_data_area_len(unsigned int *off, unsigned int *len,break ; }case SMB2_IOCTL : - *off =le32_to_cpu (((struct smb2_ioctl_req *)hdr)->InputOffset); + *off = max_t(unsigned int, +le32_to_cpu (((struct smb2_ioctl_req *)hdr)->InputOffset), + offsetof(struct smb2_ioctl_req , Buffer)); *len =le32_to_cpu (((struct smb2_ioctl_req *)hdr)->InputCount);break ;default :
fs/smb/server/smb2pdu.c +26 -22
192 lines not on this page · raw message
Signature · 1 line
2.43.0