Skip to content

Commit e2eb25b

Browse files
Murad MasimovSasha Levin
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 dc874a3 commit e2eb25b

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

fs/cifs/fs_context.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1081,11 +1081,11 @@ static int smb3_fs_context_parse_param(struct fs_context *fc,
10811081
ctx->acdirmax = ctx->acregmax = HZ * result.uint_32;
10821082
break;
10831083
case Opt_closetimeo:
1084-
ctx->closetimeo = HZ * result.uint_32;
1085-
if (ctx->closetimeo > SMB3_MAX_DCLOSETIMEO) {
1084+
if (result.uint_32 > SMB3_MAX_DCLOSETIMEO / HZ) {
10861085
cifs_errorf(fc, "closetimeo too large\n");
10871086
goto cifs_parse_mount_err;
10881087
}
1088+
ctx->closetimeo = HZ * result.uint_32;
10891089
break;
10901090
case Opt_echo_interval:
10911091
ctx->echo_interval = result.uint_32;

0 commit comments

Comments
 (0)