cifs: Fix integer overflow while processing closetimeo mount option

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>

diff --git a/fs/smb/client/fs_context.c b/fs/smb/client/fs_context.c
index 85b062e7f48db26270c6b38778f42a82c288c36f..8c73d4d60d1a7409bdf46db9ae73b35f0c0cba42 100644 (file)
--- a/fs/smb/client/fs_context.c
+++ b/fs/smb/client/fs_context.c
@@ -1370,11 +1370,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;