]> git.baikalelectronics.ru Git - kernel.git/commitdiff
vfs: fs_context: fix up param length parsing in legacy_parse_param
authorJamie Hill-Daniel <jamie@hill-daniel.co.uk>
Tue, 18 Jan 2022 07:06:04 +0000 (08:06 +0100)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 18 Jan 2022 07:23:19 +0000 (09:23 +0200)
The "PAGE_SIZE - 2 - size" calculation in legacy_parse_param() is an
unsigned type so a large value of "size" results in a high positive
value instead of a negative value as expected.  Fix this by getting rid
of the subtraction.

Signed-off-by: Jamie Hill-Daniel <jamie@hill-daniel.co.uk>
Signed-off-by: William Liu <willsroot@protonmail.com>
Tested-by: Salvatore Bonaccorso <carnil@debian.org>
Tested-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
Acked-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
fs/fs_context.c

index b7e43a780a625bca1b0faeba53e2702463ad0496..24ce12f0db32e5779d389ebcc8c49e9b35ecb9e0 100644 (file)
@@ -548,7 +548,7 @@ static int legacy_parse_param(struct fs_context *fc, struct fs_parameter *param)
                              param->key);
        }
 
-       if (len > PAGE_SIZE - 2 - size)
+       if (size + len + 2 > PAGE_SIZE)
                return invalf(fc, "VFS: Legacy: Cumulative options too large");
        if (strchr(param->key, ',') ||
            (param->type == fs_value_is_string &&