Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit af941a28 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ANDROID: fix acl leaks"

parents 09ca7fcd 4333a7d3

fs/gfs2/acl.c

+4 −1
Original line number Diff line number Diff line
@@ -78,8 +78,11 @@ int gfs2_set_acl(struct inode *inode, struct posix_acl *acl, int type) 


	if (type == ACL_TYPE_ACCESS) {

		umode_t mode = inode->i_mode;



		struct posix_acl *old_acl = acl;

		error = posix_acl_update_mode(inode, &inode->i_mode, &acl);



		if (!acl)

			posix_acl_release(old_acl);

		if (error)

			return error;

		if (mode != inode->i_mode)

fs/xfs/xfs_acl.c

+3 −1
Original line number Diff line number Diff line
@@ -287,8 +287,10 @@ xfs_set_acl(struct inode *inode, struct posix_acl *acl, int type) 


	if (type == ACL_TYPE_ACCESS) {

		umode_t mode;



		struct posix_acl *old_acl = acl;

		error = posix_acl_update_mode(inode, &mode, &acl);

		if (!acl)

			posix_acl_release(old_acl);

		if (error)

			return error;

		error = xfs_set_mode(inode, mode);