--- a/fs/overlayfs/inode.c	2016-07-31 15:41:55.613057608 +0200
+++ b/fs/overlayfs/inode.c	2016-07-31 15:46:24.498060788 +0200
@@ -63,6 +63,9 @@
 	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)