summaryrefslogtreecommitdiffstats
path: root/fs/fs_context.c
diff options
context:
space:
mode:
authorJamie Hill-Daniel <jamie@hill-daniel.co.uk>2022-01-18 08:06:04 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2022-01-18 08:23:19 +0100
commit722d94847de29310e8aa03fcbdb41fc92c521756 (patch)
treed2c1b136bdbac7375aa5c7e8c37726f2999ae2c7 /fs/fs_context.c
parentMerge tag 'pm-5.17-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/ra... (diff)
downloadlinux-722d94847de29310e8aa03fcbdb41fc92c521756.tar.xz
linux-722d94847de29310e8aa03fcbdb41fc92c521756.zip
vfs: fs_context: fix up param length parsing in legacy_parse_param
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>
Diffstat (limited to 'fs/fs_context.c')
-rw-r--r--fs/fs_context.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/fs_context.c b/fs/fs_context.c
index b7e43a780a62..24ce12f0db32 100644
--- a/fs/fs_context.c
+++ b/fs/fs_context.c
@@ -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 &&