From: Al Viro <viro@zeniv.linux.org.uk>
Date: Sun, 8 Apr 2018 15:57:10 +0000 (-0400)
Subject: getname_kernel() needs to make sure that ->name != ->iname in long case
X-Git-Tag: v4.1.52~144
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=af561a582d5acd1e901dbaee926a115c51a09bc0;p=thirdparty%2Fkernel%2Fstable.git

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

[ Upstream commit 30ce4d1903e1d8a7ccd110860a5eef3c638ed8be ]

missed it in "kill struct filename.separate" several years ago.

Cc: stable@vger.kernel.org
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
---

diff --git a/fs/namei.c b/fs/namei.c
index 0d97235019a92..4d333d26a0281 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -219,9 +219,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);