Skip to content

Commit b35969b

Browse files
committed
Merge: [CVE-2025-21963] cifs: Fix integer overflow while processing acdirmax mount option
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/6906 - Fix integer overflow while processing acdirmax mount option JIRA: https://issues.redhat.com/browse/RHEL-87940 CVE: CVE-2025-21963 Signed-off-by: Paulo Alcantara <[email protected]> Approved-by: Benjamin Coddington <[email protected]> Approved-by: Jay Shin <[email protected]> Approved-by: CKI KWF Bot <[email protected]> Approved-by: David Howells <[email protected]> Merged-by: Jan Stancek <[email protected]>
2 parents 3efbb45 + 7ce6fdd commit b35969b

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

fs/smb/client/fs_context.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1366,11 +1366,11 @@ static int smb3_fs_context_parse_param(struct fs_context *fc,
13661366
ctx->acregmax = HZ * result.uint_32;
13671367
break;
13681368
case Opt_acdirmax:
1369-
ctx->acdirmax = HZ * result.uint_32;
1370-
if (ctx->acdirmax > CIFS_MAX_ACTIMEO) {
1369+
if (result.uint_32 > CIFS_MAX_ACTIMEO / HZ) {
13711370
cifs_errorf(fc, "acdirmax too large\n");
13721371
goto cifs_parse_mount_err;
13731372
}
1373+
ctx->acdirmax = HZ * result.uint_32;
13741374
break;
13751375
case Opt_actimeo:
13761376
if (HZ * result.uint_32 > CIFS_MAX_ACTIMEO) {

0 commit comments

Comments
 (0)