Skip to content

Commit

Permalink
Prevent oopsing in posix_acl_valid()
Browse files Browse the repository at this point in the history
If posix_acl_from_xattr() returns an error code, a negative address is
dereferenced causing an oops; fix by checking for error code first.

Signed-off-by: Daniel J Blueman <daniel.blueman@gmail.com>
Reviewed-by: Josef Bacik <josef@redhat.com>
Signed-off-by: Chris Mason <chris.mason@oracle.com>
  • Loading branch information
Daniel J Blueman authored and Chris Mason committed May 14, 2011
1 parent 7cf96da commit f5de939
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions fs/btrfs/acl.c
Original file line number Diff line number Diff line change
Expand Up @@ -178,12 +178,13 @@ static int btrfs_xattr_acl_set(struct dentry *dentry, const char *name,

if (value) {
acl = posix_acl_from_xattr(value, size);
if (IS_ERR(acl))
return PTR_ERR(acl);

if (acl) {
ret = posix_acl_valid(acl);
if (ret)
goto out;
} else if (IS_ERR(acl)) {
return PTR_ERR(acl);
}
}

Expand Down

0 comments on commit f5de939

Please sign in to comment.