Skip to contentSkip to conversation

vfs_getxattr_alloc(): don't allocate buf on failure

PATCH New Miklos Szeredi 1 participant 1 message Aug 3, 2022 VFS

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 vfs_getxattr_alloc(): don't allocate buf on failure

Some callers of vfs_getxattr_alloc() assume that on failure the allocated buffer does not need to be freed.

Callers could be fixed, but fixing the semantics of vfs_getxattr_alloc() is simpler and makes sure that this class of bugs does not occur again.

If this was called in a loop (i.e. xattr_value contains an already allocated buffer), then caller will still need to clean up after an error.

Reported-and-tested-by [email protected]
Fixes 1601fbad2b14 ("xattr: define vfs_getxattr_alloc and vfs_xattr_cmp")
---
 fs/xattr.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
fs/xattr.c +4 -1
index e8dd03e4561e..c03a957902da 100644
@@ -383,7 +383,10 @@ vfs_getxattr_alloc(struct user_namespace *mnt_userns, struct dentry *dentry,
 	}
 
 	error = handler->get(handler, dentry, inode, name, value, error);
-	*xattr_value = value;
+	if (error < 0 && *xattr_value == NULL)
+		kfree(value);
+	else
+		*xattr_value = value;
 	return error;
 }
 
Signature · 1 line
2.35.3