5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christoph Hellwig hch@lst.de
[ Upstream commit 9e96c8c0e94eea2f69a9705f5d0f51928ea26c17 ]
Add a helper for struct file based chmode operations. To be used by the initramfs code soon.
Signed-off-by: Christoph Hellwig hch@lst.de Acked-by: Linus Torvalds torvalds@linux-foundation.org Stable-dep-of: 4624b346cf67 ("init: open /initrd.image with O_LARGEFILE") Signed-off-by: Sasha Levin sashal@kernel.org --- fs/open.c | 9 +++++++-- include/linux/fs.h | 1 + 2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/fs/open.c b/fs/open.c index 9213c15d8a8d6..484b300f3e026 100644 --- a/fs/open.c +++ b/fs/open.c @@ -570,14 +570,19 @@ static int chmod_common(const struct path *path, umode_t mode) return error; }
+int vfs_fchmod(struct file *file, umode_t mode) +{ + audit_file(file); + return chmod_common(&file->f_path, mode); +} + int ksys_fchmod(unsigned int fd, umode_t mode) { struct fd f = fdget(fd); int err = -EBADF;
if (f.file) { - audit_file(f.file); - err = chmod_common(&f.file->f_path, mode); + err = vfs_fchmod(f.file, mode); fdput(f); } return err; diff --git a/include/linux/fs.h b/include/linux/fs.h index 03de5c7134564..5e122cb506d6e 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -1731,6 +1731,7 @@ int vfs_mkobj(struct dentry *, umode_t, void *);
int vfs_fchown(struct file *file, uid_t user, gid_t group); +int vfs_fchmod(struct file *file, umode_t mode);
extern long vfs_ioctl(struct file *file, unsigned int cmd, unsigned long arg);