]> www.infradead.org Git - users/jedix/linux-maple.git/commit
ovl: handle ATTR_KILL*
authorMiklos Szeredi <mszeredi@redhat.com>
Mon, 4 Jul 2016 14:49:48 +0000 (16:49 +0200)
committerDhaval Giani <dhaval.giani@oracle.com>
Fri, 20 Jan 2017 22:22:05 +0000 (17:22 -0500)
commitd8aeb46003e16c2fb89123b4222c1529cf824a5b
tree3917d7e332e13eb4a757d8cb8e9766a9aba0f75a
parent30c0b2994c904ae570390880972831ea6bf1e516
ovl: handle ATTR_KILL*

Orabug: 25308102

[ Upstream commit 51234eac5dd8b5feda9a3a8fa766f5398ecf91e3 ]

commit b99c2d913810e56682a538c9f2394d76fca808f8 upstream.

Before 4bacc9c9234c ("overlayfs: Make f_path...") file->f_path pointed to
the underlying file, hence suid/sgid removal on write worked fine.

After that patch file->f_path pointed to the overlay file, and the file
mode bits weren't copied to overlay_inode->i_mode.  So the suid/sgid
removal simply stopped working.

The fix is to copy the mode bits, but then ovl_setattr() needs to clear
ATTR_MODE to avoid the BUG() in notify_change().  So do this first, then in
the next patch copy the mode.

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")
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
(cherry picked from commit cb75f65fe798bcac694f6bde299c52d31bdc8e96)
Signed-off-by: Dhaval Giani <dhaval.giani@oracle.com>
fs/overlayfs/inode.c