diff options
| author | Paul Moore <paul@paul-moore.com> | 2022-11-09 14:14:35 -0500 |
|---|---|---|
| committer | Paul Moore <paul@paul-moore.com> | 2022-11-18 17:07:03 -0500 |
| commit | f6fbd8cbf3ed1915a7b957f2801f7c306a686c08 (patch) | |
| tree | c72891942254302b6a455f09511c3b14f6c2a762 /fs/xattr.c | |
| parent | e68bfbd3b3c3a0ec3cf8c230996ad8cabe90322f (diff) | |
lsm,fs: fix vfs_getxattr_alloc() return type and caller error paths
The vfs_getxattr_alloc() function currently returns a ssize_t value
despite the fact that it only uses int values internally for return
values. Fix this by converting vfs_getxattr_alloc() to return an
int type and adjust the callers as necessary. As part of these
caller modifications, some of the callers are fixed to properly free
the xattr value buffer on both success and failure to ensure that
memory is not leaked in the failure case.
Reviewed-by: Serge Hallyn <serge@hallyn.com>
Reviewed-by: Mimi Zohar <zohar@linux.ibm.com>
Signed-off-by: Paul Moore <paul@paul-moore.com>
Diffstat (limited to 'fs/xattr.c')
| -rw-r--r-- | fs/xattr.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/xattr.c b/fs/xattr.c index 61107b6bbed2..f38fd969b5fc 100644 --- a/fs/xattr.c +++ b/fs/xattr.c @@ -354,11 +354,12 @@ out_noalloc: * vfs_getxattr_alloc - allocate memory, if necessary, before calling getxattr * * Allocate memory, if not already allocated, or re-allocate correct size, - * before retrieving the extended attribute. + * before retrieving the extended attribute. The xattr value buffer should + * always be freed by the caller, even on error. * * Returns the result of alloc, if failed, or the getxattr operation. */ -ssize_t +int vfs_getxattr_alloc(struct user_namespace *mnt_userns, struct dentry *dentry, const char *name, char **xattr_value, size_t xattr_size, gfp_t flags) |