ext2: preserve i_mode if ext2_set_acl() fails

commit fe26569eb9197d845d73abe7dd20f603d79eb031 upstream.

When changing a file's acl mask, ext2_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 only changing the inode mode after the acl has been set.

[JK: Rebased on top of "ext2: Don't clear SGID when inheriting ACLs"]
Signed-off-by: Ernesto A. Fernández <ernesto.mnd.fernandez@gmail.com>
Signed-off-by: Jan Kara <jack@suse.cz>
[bwh: Backported to 3.2: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>

diff --git a/fs/ext2/acl.c b/fs/ext2/acl.c
index d6368eb45e3c847b26d5f5944efbe377cb9e1719..5106714312dae8e23f720dc6b4f56e512efbd54e 100644 (file)
--- a/fs/ext2/acl.c
+++ b/fs/ext2/acl.c
@@ -222,15 +222,22 @@ static int
 ext2_set_acl(struct inode *inode, struct posix_acl *acl, int type)
 {
        int error;
+       int update_mode = 0;
+       umode_t mode = inode->i_mode;
 
        if (type == ACL_TYPE_ACCESS && acl) {
-               error = posix_acl_update_mode(inode, &inode->i_mode, &acl);
+               error = posix_acl_update_mode(inode, &mode, &acl);
                if (error)
                        return error;
+               update_mode = 1;
+       }
+       error = __ext2_set_acl(inode, acl, type);
+       if (!error && update_mode) {
+               inode->i_mode = mode;
                inode->i_ctime = CURRENT_TIME_SEC;
                mark_inode_dirty(inode);
        }
-       return __ext2_set_acl(inode, acl, type);
+       return error;
 }
 
 /*