diff options
| author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2016-08-12 10:27:46 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2016-08-12 10:27:46 -0400 |
| commit | a45186d2f1a6eddd3d0528f3331e19d8f6a19965 (patch) | |
| tree | 840a2626a705614acb58932602d523cf6f86c23d /fs/overlayfs/inode.c | |
| parent | c87f121f9a3bbd21852949e6db68bc4f3475ec4f (diff) | |
| parent | 133cec911c639d2cdf544ed602442951f702e08c (diff) | |
| download | linux-rt-a45186d2f1a6eddd3d0528f3331e19d8f6a19965.tar.gz | |
Merge tag 'v4.4.17' into v4.4-rt
This is the 4.4.17 stable release
Diffstat (limited to 'fs/overlayfs/inode.c')
| -rw-r--r-- | fs/overlayfs/inode.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/overlayfs/inode.c b/fs/overlayfs/inode.c index 0597820f5d9d..4f729ffff75d 100644 --- a/fs/overlayfs/inode.c +++ b/fs/overlayfs/inode.c @@ -63,6 +63,9 @@ int ovl_setattr(struct dentry *dentry, struct iattr *attr) if (!err) { upperdentry = ovl_dentry_upper(dentry); + if (attr->ia_valid & (ATTR_KILL_SUID|ATTR_KILL_SGID)) + attr->ia_valid &= ~ATTR_MODE; + mutex_lock(&upperdentry->d_inode->i_mutex); err = notify_change(upperdentry, attr, NULL); if (!err) |