Skip to content

Commit 6c13fcb

Browse files
Murad Masimovgregkh
authored andcommitted
cifs: Fix integer overflow while processing closetimeo mount option
[ Upstream commit d5a30fd ] 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: 5efdd91 ("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>
1 parent d5fff81 commit 6c13fcb

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

fs/smb/client/fs_context.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1292,11 +1292,11 @@ static int smb3_fs_context_parse_param(struct fs_context *fc,
12921292
ctx->acdirmax = ctx->acregmax = HZ * result.uint_32;
12931293
break;
12941294
case Opt_closetimeo:
1295-
ctx->closetimeo = HZ * result.uint_32;
1296-
if (ctx->closetimeo > SMB3_MAX_DCLOSETIMEO) {
1295+
if (result.uint_32 > SMB3_MAX_DCLOSETIMEO / HZ) {
12971296
cifs_errorf(fc, "closetimeo too large\n");
12981297
goto cifs_parse_mount_err;
12991298
}
1299+
ctx->closetimeo = HZ * result.uint_32;
13001300
break;
13011301
case Opt_echo_interval:
13021302
ctx->echo_interval = result.uint_32;

0 commit comments

Comments
 (0)