nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

ovl: Copy up underlying inode's ->i_mode to overlay inode

Browse source 
Right now when a new overlay inode is created, we initialize overlay
inode's ->i_mode from underlying inode ->i_mode but we retain only
file type bits (S_IFMT) and discard permission bits.

This patch changes it and retains permission bits too. This should allow
overlay to do permission checks on overlay inode itself in task context.

[SzM] It also fixes clearing suid/sgid bits on write.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Reported-by: Eryu Guan <eguan@redhat.com>
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
Fixes: 4bacc9c923 ("overlayfs: Make f_path always point to the overlay and f_inode to the underlay")
Cc: <stable@vger.kernel.org>
This commit is contained in:
Vivek Goyal 2016-07-01 16:34:25 -04:00 committed by Miklos Szeredi
parent b99c2d9138
commit 07a2daab49
2 changed files with 2 additions and 2 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

3
fs/overlayfs/inode.c
View file

@ -413,12 +413,11 @@ struct inode *ovl_new_inode(struct super_block *sb, umode_t mode,
if (!inode) if (!inode)
return NULL; return NULL;
mode &= S_IFMT;
inode->i_ino = get_next_ino(); inode->i_ino = get_next_ino();
inode->i_mode = mode; inode->i_mode = mode;
inode->i_flags |= S_NOATIME | S_NOCMTIME; inode->i_flags |= S_NOATIME | S_NOCMTIME;
mode &= S_IFMT;
switch (mode) { switch (mode) {
case S_IFDIR: case S_IFDIR:
inode->i_private = oe; inode->i_private = oe;

1
fs/overlayfs/overlayfs.h
View file

@ -187,6 +187,7 @@ static inline void ovl_copyattr(struct inode *from, struct inode *to)
{ {
to->i_uid = from->i_uid; to->i_uid = from->i_uid;
to->i_gid = from->i_gid; to->i_gid = from->i_gid;
to->i_mode = from->i_mode;
} }
/* dir.c */ /* dir.c */