Skip to contentSkip to conversation

9p: fix a potential acl leak

PATCH Superseded Cong Wang 2 participants 2 messages Dec 13, 2016 – Dec 14, 2016 9P file system

lore
Share & tools
lore

Cong Wang

author
#0 lore raw

PATCH 1/1 9p: fix a potential acl leak

posix_acl_update_mode() could possibly clear 'acl', if so we leak the memory pointed by 'acl'. Save this pointer before calling posix_acl_update_mode() and release the memory if 'acl' really gets cleared.

Cc Eric Van Hensbergen <[email protected]>
Cc Ron Minnich <[email protected]>
Cc Latchesar Ionkov <[email protected]>
---
 fs/9p/acl.c | 2 ++
 1 file changed, 2 insertions(+)
fs/9p/acl.c +2 -0
index b3c2cc7..082d227 100644
@@ -277,6 +277,7 @@ static int v9fs_xattr_set_acl(const struct xattr_handler *handler,
 	case ACL_TYPE_ACCESS:
 		if (acl) {
 			struct iattr iattr;
+			struct posix_acl *old_acl = acl;
 
 			retval = posix_acl_update_mode(inode, &iattr.ia_mode, &acl);
 			if (retval)
@@ -287,6 +288,7 @@ static int v9fs_xattr_set_acl(const struct xattr_handler *handler,
 				 * by the mode bits. So don't
 				 * update ACL.
 				 */
+				posix_acl_release(old_acl);
 				value = NULL;
 				size = 0;
 			}
Signature · 1 line
2.5.5
Reviewed-by on v1 1/1
#1 lore raw
Quoted 5 lines · On Tue, 13 Dec 2016 10:33:34 -0800 Cong Wang <[email protected]> wrote:

posix_acl_update_mode() could possibly clear 'acl', if so we leak the memory pointed by 'acl'. Save this pointer before calling posix_acl_update_mode() and release the memory if 'acl' really gets cleared.

Quoted 7 lines
Cc Eric Van Hensbergen <[email protected]>
Cc Ron Minnich <[email protected]>
Cc Latchesar Ionkov <[email protected]>

---

Quoted 23 lines
 fs/9p/acl.c | 2 ++
 1 file changed, 2 insertions(+)
fs/9p/acl.c +2 -0
index b3c2cc7..082d227 100644
@@ -277,6 +277,7 @@ static int v9fs_xattr_set_acl(const struct xattr_handler *handler,
 	case ACL_TYPE_ACCESS:
 		if (acl) {
 			struct iattr iattr;
+			struct posix_acl *old_acl = acl;
 
 			retval = posix_acl_update_mode(inode, &iattr.ia_mode, &acl);
 			if (retval)
@@ -287,6 +288,7 @@ static int v9fs_xattr_set_acl(const struct xattr_handler *handler,
 				 * by the mode bits. So don't
 				 * update ACL.
 				 */
+				posix_acl_release(old_acl);
 				value = NULL;
 				size = 0;
 			}