btrfs: preserve i_mode if __btrfs_set_acl() fails
authorErnesto A. Fernández <ernesto.mnd.fernandez@gmail.com>
Wed, 2 Aug 2017 06:18:27 +0000 (03:18 -0300)
committerBen Hutchings <ben@decadent.org.uk>
Thu, 12 Oct 2017 14:27:18 +0000 (15:27 +0100)
commitb6a9dc365dce00946080ccc482fc20a6b6c1476b
treec4fda86e412fdc9a7fd41e85e66674c960104537
parent36d0828c0295524c261c6d1df93203a3379c9bb1
btrfs: preserve i_mode if __btrfs_set_acl() fails

commit d7d824966530acfe32b94d1ed672e6fe1638cd68 upstream.

When changing a file's acl mask, btrfs_set_acl() will first set the
group bits of i_mode to the value of the mask, and only then set the
actual extended attribute representing the new acl.

If the second part fails (due to lack of space, for example) and the
file had no acl attribute to begin with, the system will from now on
assume that the mask permission bits are actual group permission bits,
potentially granting access to the wrong users.

Prevent this by restoring the original mode bits if __btrfs_set_acl
fails.

Signed-off-by: Ernesto A. Fernández <ernesto.mnd.fernandez@gmail.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
[bwh: Backported to 3.2: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
fs/btrfs/acl.c