cifs: Fix integer overflow while processing acregmax mount option

Murad Masimov · Steve French · commit 7489161b1852 · 2025-03-13T08:41:27.000-05:00
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: 5780464 ("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>
diff --git a/fs/smb/client/fs_context.c b/fs/smb/client/fs_context.c
@@ -1344,11 +1344,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;

Original file line number	Diff line number	Diff line change
`@@ -1344,11 +1344,11 @@ static int smb3_fs_context_parse_param(struct fs_context *fc,`
`1344`	`1344`	`}`
`1345`	`1345`	`break;`
`1346`	`1346`	`case Opt_acregmax:`
`1347`		`- ctx->acregmax = HZ * result.uint_32;`
`1348`		`- if (ctx->acregmax > CIFS_MAX_ACTIMEO) {`
	`1347`	`+ if (result.uint_32 > CIFS_MAX_ACTIMEO / HZ) {`
`1349`	`1348`	`cifs_errorf(fc, "acregmax too large\n");`
`1350`	`1349`	`goto cifs_parse_mount_err;`
`1351`	`1350`	`}`
	`1351`	`+ ctx->acregmax = HZ * result.uint_32;`
`1352`	`1352`	`break;`
`1353`	`1353`	`case Opt_acdirmax:`
`1354`	`1354`	`ctx->acdirmax = HZ * result.uint_32;`