diff options
| author | Vivek Goyal <vgoyal@redhat.com> | 2016-07-01 16:34:25 -0400 |
|---|---|---|
| committer | Sasha Levin <alexander.levin@verizon.com> | 2016-08-07 21:44:56 -0400 |
| commit | a3638d4fdf49046a09a71d9ce8c426bbfd37fbbc (patch) | |
| tree | 4ee6d735e6578f80f376ec5cd7c3cf813f349840 /fs | |
| parent | d4e1ac55843e799890318798794d7e6b48a68d4c (diff) | |
| download | lwn-a3638d4fdf49046a09a71d9ce8c426bbfd37fbbc.tar.gz lwn-a3638d4fdf49046a09a71d9ce8c426bbfd37fbbc.zip | |
ovl: Copy up underlying inode's ->i_mode to overlay inode
[ Upstream commit 07a2daab49c549a37b5b744cbebb6e3f445f12bc ]
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: 4bacc9c9234c ("overlayfs: Make f_path always point to the overlay and f_inode to the underlay")
Cc: <stable@vger.kernel.org>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/overlayfs/inode.c | 3 | ||||
| -rw-r--r-- | fs/overlayfs/overlayfs.h | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/overlayfs/inode.c b/fs/overlayfs/inode.c index 7b0f4e39768f..fefce48e0f31 100644 --- a/fs/overlayfs/inode.c +++ b/fs/overlayfs/inode.c @@ -399,12 +399,11 @@ struct inode *ovl_new_inode(struct super_block *sb, umode_t mode, if (!inode) return NULL; - mode &= S_IFMT; - inode->i_ino = get_next_ino(); inode->i_mode = mode; inode->i_flags |= S_NOATIME | S_NOCMTIME; + mode &= S_IFMT; switch (mode) { case S_IFDIR: inode->i_private = oe; diff --git a/fs/overlayfs/overlayfs.h b/fs/overlayfs/overlayfs.h index 1714fcc7603e..00eb848faad8 100644 --- a/fs/overlayfs/overlayfs.h +++ b/fs/overlayfs/overlayfs.h @@ -173,6 +173,7 @@ static inline void ovl_copyattr(struct inode *from, struct inode *to) { to->i_uid = from->i_uid; to->i_gid = from->i_gid; + to->i_mode = from->i_mode; } /* dir.c */ |