summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMurad Masimov <m.masimov@mt-integration.ru>2025-03-11 17:22:06 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2025-03-22 22:54:27 +0300
commit1c46673be93dd2954f44fe370fb4f2b8e6214224 (patch)
tree24f0169d1503f587c6624249ba062b122926ade8
parent4740cef2a9d04efc28931b67b7d1c7498d83fe7e (diff)
downloadlinux-1c46673be93dd2954f44fe370fb4f2b8e6214224.tar.xz
cifs: Fix integer overflow while processing closetimeo mount option
[ Upstream commit d5a30fddfe2f2e540f6c43b59cf701809995faef ] User-provided mount parameter closetimeo 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: 5efdd9122eff ("smb3: allow deferred close timeout to be configurable") Signed-off-by: Murad Masimov <m.masimov@mt-integration.ru> Signed-off-by: Steve French <stfrench@microsoft.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--fs/smb/client/fs_context.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/smb/client/fs_context.c b/fs/smb/client/fs_context.c
index 934c45ec8195..f8bc1da30037 100644
--- a/fs/smb/client/fs_context.c
+++ b/fs/smb/client/fs_context.c
@@ -1280,11 +1280,11 @@ static int smb3_fs_context_parse_param(struct fs_context *fc,
ctx->acdirmax = ctx->acregmax = HZ * result.uint_32;
break;
case Opt_closetimeo:
- ctx->closetimeo = HZ * result.uint_32;
- if (ctx->closetimeo > SMB3_MAX_DCLOSETIMEO) {
+ if (result.uint_32 > SMB3_MAX_DCLOSETIMEO / HZ) {
cifs_errorf(fc, "closetimeo too large\n");
goto cifs_parse_mount_err;
}
+ ctx->closetimeo = HZ * result.uint_32;
break;
case Opt_echo_interval:
ctx->echo_interval = result.uint_32;