diff options
| author | Ernesto A. Fernandez | 2018-02-07 00:49:02 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2018-02-07 03:32:45 +0100 |
| commit | b0cd38c7f54c9176f78cce2e2b23e1513bf5a224 (patch) | |
| tree | 590524511319243c72325593651f2b1ef8823e32 /fs/hfsplus/inode.c | |
| parent | nilfs2: use time64_t internally (diff) | |
| download | kernel-qcow2-linux-b0cd38c7f54c9176f78cce2e2b23e1513bf5a224.tar.gz kernel-qcow2-linux-b0cd38c7f54c9176f78cce2e2b23e1513bf5a224.tar.xz kernel-qcow2-linux-b0cd38c7f54c9176f78cce2e2b23e1513bf5a224.zip | |
hfsplus: honor setgid flag on directories
When creating a file inside a directory that has the setgid flag set, give
the new file the group ID of the parent, and also the setgid flag if it is
a directory itself.
Link: http://lkml.kernel.org/r/20171204192705.GA6101@debian.home
Signed-off-by: Ernesto A. Fernandez <ernesto.mnd.fernandez@gmail.com>
Reviewed-by: Vyacheslav Dubeyko <slava@dubeyko.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/hfsplus/inode.c')
| -rw-r--r-- | fs/hfsplus/inode.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/fs/hfsplus/inode.c b/fs/hfsplus/inode.c index 190c60efbc99..c0c8d433864f 100644 --- a/fs/hfsplus/inode.c +++ b/fs/hfsplus/inode.c @@ -354,7 +354,8 @@ static const struct file_operations hfsplus_file_operations = { .unlocked_ioctl = hfsplus_ioctl, }; -struct inode *hfsplus_new_inode(struct super_block *sb, umode_t mode) +struct inode *hfsplus_new_inode(struct super_block *sb, struct inode *dir, + umode_t mode) { struct hfsplus_sb_info *sbi = HFSPLUS_SB(sb); struct inode *inode = new_inode(sb); @@ -364,9 +365,7 @@ struct inode *hfsplus_new_inode(struct super_block *sb, umode_t mode) return NULL; inode->i_ino = sbi->next_cnid++; - inode->i_mode = mode; - inode->i_uid = current_fsuid(); - inode->i_gid = current_fsgid(); + inode_init_owner(inode, dir, mode); set_nlink(inode, 1); inode->i_mtime = inode->i_atime = inode->i_ctime = current_time(inode); |