commit 260f3a0939a1232a5041d0780178e8c80a867d7c
author Vaibhav Rustagi <vaibhavrustagi@google.com> Wed Jan 19 16:44:56 2022 -0800
committer Vaibhav Rustagi <vaibhavrustagi@google.com> Wed Jan 19 16:44:56 2022 -0800
tree 73e512670b0bafda14e99a44a18f6628a5f41bda
parent 9d09f1c97e1b1825f264d9ae9da106112d232f74
parent 94441bb763e7f6040896f47b8d7b445d5b7accb6

LTS Refresh: Merge upto 94441bb763e7f6040896f47b8d7b445d5b7accb6 (buildnumber: 13310.1416.0) from main-R85-13310.B-cos-5.4 to release-R85-13310.B-cos-5.4.

BUG=b/203240991,b/205968222,b/205321429
TEST=presubmit
RELEASE_NOTE=LTS Refresh from main-R85-13310.B-cos-5.4 to release-R85-13310.B-cos-5.4

Signed-off-by: Vaibhav Rustagi <vaibhavrustagi@google.com>
Change-Id: I912980b40aced38c1336511664270ed2ab5347d2

fs/fs_context.c

diff --git a/fs/fs_context.c b/fs/fs_context.c
index 138b5b4..a2367c7 100644
--- a/fs/fs_context.c
+++ b/fs/fs_context.c
@@ -585,7 +585,7 @@
 			      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 &&