]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
cifs: Fix integer overflow while processing acregmax mount option
authorMurad Masimov <m.masimov@mt-integration.ru>
Tue, 11 Mar 2025 14:22:03 +0000 (17:22 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 22 Mar 2025 19:54:27 +0000 (12:54 -0700)
[ Upstream commit 7489161b1852390b4413d57f2457cd40b34da6cc ]

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: 5780464614f6 ("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: Sasha Levin <sashal@kernel.org>
fs/smb/client/fs_context.c

index 21f8597f8d82ea344f2727ca6b4dec9a0ee54a7c..e03946dc1d965c01b584ce28d29691e3b99ffed4 100644 (file)
@@ -1254,11 +1254,11 @@ static int smb3_fs_context_parse_param(struct fs_context *fc,
                }
                break;
        case Opt_acregmax:
-               ctx->acregmax = HZ * result.uint_32;
-               if (ctx->acregmax > CIFS_MAX_ACTIMEO) {
+               if (result.uint_32 > CIFS_MAX_ACTIMEO / HZ) {
                        cifs_errorf(fc, "acregmax too large\n");
                        goto cifs_parse_mount_err;
                }
+               ctx->acregmax = HZ * result.uint_32;
                break;
        case Opt_acdirmax:
                ctx->acdirmax = HZ * result.uint_32;