Skip to content

[LTS 8.6] CVE-2023-51043, CVE-2023-6606, CVE-2023-6610, CVE-2022-50341 #837

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pvts-mat wants to merge 5 commits into
base: ciqlts8_6
Choose a base branch
from
Open

[LTS 8.6] CVE-2023-51043, CVE-2023-6606, CVE-2023-6610, CVE-2022-50341 #837

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1eef800
drm/atomic: Fix potential use-after-free in nonblocking commits
pvts-mat Jul 21, 2023
e73c4b5
smb: client: fix OOB in smbCalcSize()
pvts-mat Dec 15, 2023
c676e81
smb: client: fix potential OOB in smb2_dump_detail()
pvts-mat Jan 27, 2026
9d7406e
cifs: fix oops during encryption
pvts-mat Dec 11, 2022
b8b9532
cifs: Remove duplicated include in cifsglob.h
pvts-mat Dec 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions fs/cifs/smb2misc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,21 @@ smb2_check_message(char *buf, unsigned int len, struct TCP_Server_Info *srvr)
}

mid = le64_to_cpu(shdr->MessageId);
if (check_smb2_hdr(shdr, mid))
return 1;

if (shdr->StructureSize != SMB2_HEADER_STRUCTURE_SIZE) {
cifs_dbg(VFS, "Invalid structure size %u\n",
le16_to_cpu(shdr->StructureSize));
return 1;
}

command = le16_to_cpu(shdr->Command);
if (command >= NUMBER_OF_SMB2_COMMANDS) {
cifs_dbg(VFS, "Invalid SMB2 command %d\n", command);
return 1;
}

if (len < pdu_size) {
if ((len >= hdr_size)
&& (shdr->Status != 0)) {
Expand All @@ -186,21 +201,6 @@ smb2_check_message(char *buf, unsigned int len, struct TCP_Server_Info *srvr)
return 1;
}

if (check_smb2_hdr(shdr, mid))
return 1;

if (shdr->StructureSize != SMB2_HEADER_STRUCTURE_SIZE) {
cifs_dbg(VFS, "Invalid structure size %u\n",
le16_to_cpu(shdr->StructureSize));
return 1;
}

command = le16_to_cpu(shdr->Command);
if (command >= NUMBER_OF_SMB2_COMMANDS) {
cifs_dbg(VFS, "Invalid SMB2 command %d\n", command);
return 1;
}

if (smb2_rsp_struct_sizes[command] != pdu->StructureSize2) {
if (command != SMB2_OPLOCK_BREAK_HE && (shdr->Status == 0 ||
pdu->StructureSize2 != SMB2_ERROR_STRUCTURE_SIZE2)) {
Expand Down
6 changes: 4 additions & 2 deletions fs/cifs/smb2ops.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,8 +327,10 @@ smb2_dump_detail(void *buf, struct TCP_Server_Info *server)
cifs_server_dbg(VFS, "Cmd: %d Err: 0x%x Flags: 0x%x Mid: %llu Pid: %d\n",
shdr->Command, shdr->Status, shdr->Flags, shdr->MessageId,
shdr->ProcessId);
cifs_server_dbg(VFS, "smb buf %p len %u\n", buf,
server->ops->calc_smb_size(buf, server));
if (!server->ops->check_message(buf, server->total_read, server)) {
cifs_server_dbg(VFS, "smb buf %p len %u\n", buf,
server->ops->calc_smb_size(buf, server));
Copy link
Collaborator

@PlaidCat PlaidCat Jan 30, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Other Reviewers note:
This is technically different too its not worth back-porting or mentioning as there probalby wasn't a conflict in the git-cherry-pick. If there was or you want to uptdate it @pvts-mat please rebase to the latest lts8.6 base.
71992e6

The fix to our tooling not being at the tip of branch is not prioritize so it'll be annoying for a little longer.

}
#endif
}

Expand Down