Merge "FROMLIST: 9p: fix a potential acl leak"
This commit is contained in:
commit
0fc565ebdb
1 changed files with 2 additions and 0 deletions
|
@ -283,6 +283,7 @@ static int v9fs_xattr_set_acl(const struct xattr_handler *handler,
|
||||||
case ACL_TYPE_ACCESS:
|
case ACL_TYPE_ACCESS:
|
||||||
if (acl) {
|
if (acl) {
|
||||||
struct iattr iattr;
|
struct iattr iattr;
|
||||||
|
struct posix_acl *old_acl = acl;
|
||||||
|
|
||||||
retval = posix_acl_update_mode(inode, &iattr.ia_mode, &acl);
|
retval = posix_acl_update_mode(inode, &iattr.ia_mode, &acl);
|
||||||
if (retval)
|
if (retval)
|
||||||
|
@ -293,6 +294,7 @@ static int v9fs_xattr_set_acl(const struct xattr_handler *handler,
|
||||||
* by the mode bits. So don't
|
* by the mode bits. So don't
|
||||||
* update ACL.
|
* update ACL.
|
||||||
*/
|
*/
|
||||||
|
posix_acl_release(old_acl);
|
||||||
value = NULL;
|
value = NULL;
|
||||||
size = 0;
|
size = 0;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue