diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-23 08:25:02 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-23 08:25:02 +0300 |
| commit | 88083e9845612826dfd44a5215647b4f6567317c (patch) | |
| tree | 3d5df28425c5820a721fb915252aba7b08eaf029 /fs/overlayfs/overlayfs.h | |
| parent | b1386cedda177b10fac009ca8d3681034f15b5b3 (diff) | |
| parent | cfc9fde0b07c3b44b570057c5f93dda59dca1c94 (diff) | |
| download | linux-88083e9845612826dfd44a5215647b4f6567317c.tar.xz | |
Merge branch 'overlayfs-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs
Pull overlayfs fixes from Miklos Szeredi:
"This contains a fix for a potential crash/corruption issue and another
where the suid/sgid bits weren't cleared on write"
* 'overlayfs-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs:
ovl: verify upper dentry in ovl_remove_and_whiteout()
ovl: Copy up underlying inode's ->i_mode to overlay inode
ovl: handle ATTR_KILL*
Diffstat (limited to 'fs/overlayfs/overlayfs.h')
| -rw-r--r-- | fs/overlayfs/overlayfs.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/overlayfs/overlayfs.h b/fs/overlayfs/overlayfs.h index 4bd9b5ba8f42..cfbca53590d0 100644 --- a/fs/overlayfs/overlayfs.h +++ b/fs/overlayfs/overlayfs.h @@ -187,6 +187,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 */ |