Skip to content

Commit d1041b9

Browse files
committed
Merge: CVE-2025-21964: cifs: Fix integer overflow while processing acregmax mount option
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/6804 JIRA: https://issues.redhat.com/browse/RHEL-87920 CVE: CVE-2025-21964 ``` commit 7489161 Author: Murad Masimov <m.masimov@mt-integration.ru> Date: Tue Mar 11 17:22:03 2025 +0300 cifs: Fix integer overflow while processing acregmax mount option User-provided mount parameter acregmax of type u32 is intended to have an upper limit, but before it is validated, the value is converted from seconds to jiffies which can lead to an integer overflow. Found by Linux Verification Center (linuxtesting.org) with SVACE. Fixes: 5780464 ("cifs: Add new parameter "acregmax" for distinct file and directory metadata timeout") Signed-off-by: Murad Masimov <m.masimov@mt-integration.ru> Signed-off-by: Steve French <stfrench@microsoft.com>``` Signed-off-by: CKI Backport Bot <cki-ci-bot+cki-gitlab-backport-bot@redhat.com> --- <small>Created 2025-04-29 14:37 UTC by backporter - [KWF FAQ](https://red.ht/kernel_workflow_doc) - [Slack #team-kernel-workflow](https://redhat-internal.slack.com/archives/C04LRUPMJQ5) - [Source](https://gitlab.com/cki-project/kernel-workflow/-/blob/main/webhook/utils/backporter.py) - [Documentation](https://gitlab.com/cki-project/kernel-workflow/-/blob/main/docs/README.backporter.md) - [Report an issue](https://issues.redhat.com/secure/CreateIssueDetails!init.jspa?pid=12334433&issuetype=1&priority=4&summary=backporter+webhook+issue&components=kernel-workflow+/+backporter)</small> Approved-by: Paulo Alcantara <paalcant@redhat.com> Approved-by: Jay Shin <jaeshin@redhat.com> Approved-by: Benjamin Coddington <bcodding@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: Augusto Caringi <acaringi@redhat.com>
2 parents bccf7d4 + 6c25adb commit d1041b9

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
@@ -1359,11 +1359,11 @@ static int smb3_fs_context_parse_param(struct fs_context *fc,
13591359
}
13601360
break;
13611361
case Opt_acregmax:
1362-
ctx->acregmax = HZ * result.uint_32;
1363-
if (ctx->acregmax > CIFS_MAX_ACTIMEO) {
1362+
if (result.uint_32 > CIFS_MAX_ACTIMEO / HZ) {
13641363
cifs_errorf(fc, "acregmax too large\n");
13651364
goto cifs_parse_mount_err;
13661365
}
1366+
ctx->acregmax = HZ * result.uint_32;
13671367
break;
13681368
case Opt_acdirmax:
13691369
ctx->acdirmax = HZ * result.uint_32;

0 commit comments

Comments
 (0)