Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   daurnimator <quae@daurnimator.com>
Cc:     quae@daurnimator.com, Alexander Viro <viro@zeniv.linux.org.uk>,
        linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH] fs: only pass valid chmod mode_t bits to security_path_chmod
Date:   Mon, 13 Apr 2020 18:56:45 +1000
Message-Id: <20200413085645.135829-1-quae@daurnimator.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
To:     unlisted-recipients:; (no To-header on input)
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

chmod only pays attention to some of the flags in umode_t, don't pass
on irrelevant flags to security_path_chmod.

Signed-off-by: daurnimator <quae@daurnimator.com>
---
 fs/open.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/fs/open.c b/fs/open.c
index b69d6eed67e6..a2d8bee88a3c 100644
--- a/fs/open.c
+++ b/fs/open.c
@@ -551,12 +551,13 @@ static int chmod_common(const struct path *path, umode_t mode)
 	error = mnt_want_write(path->mnt);
 	if (error)
 		return error;
+	mode &= S_IALLUGO;
 retry_deleg:
 	inode_lock(inode);
 	error = security_path_chmod(path, mode);
 	if (error)
 		goto out_unlock;
-	newattrs.ia_mode = (mode & S_IALLUGO) | (inode->i_mode & ~S_IALLUGO);
+	newattrs.ia_mode = mode | (inode->i_mode & ~S_IALLUGO);
 	newattrs.ia_valid = ATTR_MODE | ATTR_CTIME;
 	error = notify_change(path->dentry, &newattrs, &delegated_inode);
 out_unlock:
-- 
2.26.0