getname_kernel() needs to make sure that ->name != ->iname in long case

commit 30ce4d1 upstream. missed it in "kill struct filename.separate" several years ago. Cc: [email protected] Signed-off-by: Al Viro <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
Dmole · Apr 19, 2018 · c3efeaa · c3efeaa
1 parent adea72f
commit c3efeaa
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/fs/namei.c b/fs/namei.c
@@ -222,9 +222,10 @@ getname_kernel(const char * filename)
 	if (len <= EMBEDDED_NAME_MAX) {
 		result->name = (char *)result->iname;
 	} else if (len <= PATH_MAX) {
+		const size_t size = offsetof(struct filename, iname[1]);
 		struct filename *tmp;
 
-		tmp = kmalloc(sizeof(*tmp), GFP_KERNEL);
+		tmp = kmalloc(size, GFP_KERNEL);
 		if (unlikely(!tmp)) {
 			__putname(result);
 			return ERR_PTR(-ENOMEM);