Commit f6fbd8cb authored by Paul Moore's avatar Paul Moore

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: default avatarSerge Hallyn <serge@hallyn.com>
Reviewed-by: default avatarMimi Zohar <zohar@linux.ibm.com>
Signed-off-by: default avatarPaul Moore <paul@paul-moore.com>
parent e68bfbd3
...@@ -354,11 +354,12 @@ xattr_getsecurity(struct user_namespace *mnt_userns, struct inode *inode, ...@@ -354,11 +354,12 @@ xattr_getsecurity(struct user_namespace *mnt_userns, struct inode *inode,
* vfs_getxattr_alloc - allocate memory, if necessary, before calling getxattr * vfs_getxattr_alloc - allocate memory, if necessary, before calling getxattr
* *
* Allocate memory, if not already allocated, or re-allocate correct size, * 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. * 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, vfs_getxattr_alloc(struct user_namespace *mnt_userns, struct dentry *dentry,
const char *name, char **xattr_value, size_t xattr_size, const char *name, char **xattr_value, size_t xattr_size,
gfp_t flags) gfp_t flags)
......
...@@ -68,7 +68,7 @@ int __vfs_removexattr_locked(struct user_namespace *, struct dentry *, ...@@ -68,7 +68,7 @@ int __vfs_removexattr_locked(struct user_namespace *, struct dentry *,
int vfs_removexattr(struct user_namespace *, struct dentry *, const char *); int vfs_removexattr(struct user_namespace *, struct dentry *, const char *);
ssize_t generic_listxattr(struct dentry *dentry, char *buffer, size_t buffer_size); ssize_t generic_listxattr(struct dentry *dentry, char *buffer, size_t buffer_size);
ssize_t vfs_getxattr_alloc(struct user_namespace *mnt_userns, int vfs_getxattr_alloc(struct user_namespace *mnt_userns,
struct dentry *dentry, const char *name, struct dentry *dentry, const char *name,
char **xattr_value, size_t size, gfp_t flags); char **xattr_value, size_t size, gfp_t flags);
......
...@@ -311,10 +311,9 @@ static int aa_xattrs_match(const struct linux_binprm *bprm, ...@@ -311,10 +311,9 @@ static int aa_xattrs_match(const struct linux_binprm *bprm,
struct aa_profile *profile, unsigned int state) struct aa_profile *profile, unsigned int state)
{ {
int i; int i;
ssize_t size;
struct dentry *d; struct dentry *d;
char *value = NULL; char *value = NULL;
int value_size = 0, ret = profile->xattr_count; int size, value_size = 0, ret = profile->xattr_count;
if (!bprm || !profile->xattr_count) if (!bprm || !profile->xattr_count)
return 0; return 0;
......
...@@ -350,14 +350,14 @@ static __u32 sansflags(__u32 m) ...@@ -350,14 +350,14 @@ static __u32 sansflags(__u32 m)
return m & ~VFS_CAP_FLAGS_EFFECTIVE; return m & ~VFS_CAP_FLAGS_EFFECTIVE;
} }
static bool is_v2header(size_t size, const struct vfs_cap_data *cap) static bool is_v2header(int size, const struct vfs_cap_data *cap)
{ {
if (size != XATTR_CAPS_SZ_2) if (size != XATTR_CAPS_SZ_2)
return false; return false;
return sansflags(le32_to_cpu(cap->magic_etc)) == VFS_CAP_REVISION_2; return sansflags(le32_to_cpu(cap->magic_etc)) == VFS_CAP_REVISION_2;
} }
static bool is_v3header(size_t size, const struct vfs_cap_data *cap) static bool is_v3header(int size, const struct vfs_cap_data *cap)
{ {
if (size != XATTR_CAPS_SZ_3) if (size != XATTR_CAPS_SZ_3)
return false; return false;
...@@ -379,7 +379,7 @@ int cap_inode_getsecurity(struct user_namespace *mnt_userns, ...@@ -379,7 +379,7 @@ int cap_inode_getsecurity(struct user_namespace *mnt_userns,
struct inode *inode, const char *name, void **buffer, struct inode *inode, const char *name, void **buffer,
bool alloc) bool alloc)
{ {
int size, ret; int size;
kuid_t kroot; kuid_t kroot;
u32 nsmagic, magic; u32 nsmagic, magic;
uid_t root, mappedroot; uid_t root, mappedroot;
...@@ -395,20 +395,18 @@ int cap_inode_getsecurity(struct user_namespace *mnt_userns, ...@@ -395,20 +395,18 @@ int cap_inode_getsecurity(struct user_namespace *mnt_userns,
dentry = d_find_any_alias(inode); dentry = d_find_any_alias(inode);
if (!dentry) if (!dentry)
return -EINVAL; return -EINVAL;
size = vfs_getxattr_alloc(mnt_userns, dentry, XATTR_NAME_CAPS, &tmpbuf,
size = sizeof(struct vfs_ns_cap_data); sizeof(struct vfs_ns_cap_data), GFP_NOFS);
ret = (int)vfs_getxattr_alloc(mnt_userns, dentry, XATTR_NAME_CAPS,
&tmpbuf, size, GFP_NOFS);
dput(dentry); dput(dentry);
/* gcc11 complains if we don't check for !tmpbuf */
if (ret < 0 || !tmpbuf) if (size < 0 || !tmpbuf)
return ret; goto out_free;
fs_ns = inode->i_sb->s_user_ns; fs_ns = inode->i_sb->s_user_ns;
cap = (struct vfs_cap_data *) tmpbuf; cap = (struct vfs_cap_data *) tmpbuf;
if (is_v2header((size_t) ret, cap)) { if (is_v2header(size, cap)) {
root = 0; root = 0;
} else if (is_v3header((size_t) ret, cap)) { } else if (is_v3header(size, cap)) {
nscap = (struct vfs_ns_cap_data *) tmpbuf; nscap = (struct vfs_ns_cap_data *) tmpbuf;
root = le32_to_cpu(nscap->rootid); root = le32_to_cpu(nscap->rootid);
} else { } else {
......
...@@ -335,14 +335,15 @@ static int evm_is_immutable(struct dentry *dentry, struct inode *inode) ...@@ -335,14 +335,15 @@ static int evm_is_immutable(struct dentry *dentry, struct inode *inode)
(char **)&xattr_data, 0, GFP_NOFS); (char **)&xattr_data, 0, GFP_NOFS);
if (rc <= 0) { if (rc <= 0) {
if (rc == -ENODATA) if (rc == -ENODATA)
return 0; rc = 0;
return rc; goto out;
} }
if (xattr_data->type == EVM_XATTR_PORTABLE_DIGSIG) if (xattr_data->type == EVM_XATTR_PORTABLE_DIGSIG)
rc = 1; rc = 1;
else else
rc = 0; rc = 0;
out:
kfree(xattr_data); kfree(xattr_data);
return rc; return rc;
} }
......
...@@ -519,14 +519,17 @@ static int evm_xattr_change(struct user_namespace *mnt_userns, ...@@ -519,14 +519,17 @@ static int evm_xattr_change(struct user_namespace *mnt_userns,
rc = vfs_getxattr_alloc(&init_user_ns, dentry, xattr_name, &xattr_data, rc = vfs_getxattr_alloc(&init_user_ns, dentry, xattr_name, &xattr_data,
0, GFP_NOFS); 0, GFP_NOFS);
if (rc < 0) if (rc < 0) {
return 1; rc = 1;
goto out;
}
if (rc == xattr_value_len) if (rc == xattr_value_len)
rc = !!memcmp(xattr_value, xattr_data, rc); rc = !!memcmp(xattr_value, xattr_data, rc);
else else
rc = 1; rc = 1;
out:
kfree(xattr_data); kfree(xattr_data);
return rc; return rc;
} }
......
...@@ -326,7 +326,7 @@ enum integrity_status ima_get_cache_status(struct integrity_iint_cache *iint, ...@@ -326,7 +326,7 @@ enum integrity_status ima_get_cache_status(struct integrity_iint_cache *iint,
enum hash_algo ima_get_hash_algo(const struct evm_ima_xattr_data *xattr_value, enum hash_algo ima_get_hash_algo(const struct evm_ima_xattr_data *xattr_value,
int xattr_len); int xattr_len);
int ima_read_xattr(struct dentry *dentry, int ima_read_xattr(struct dentry *dentry,
struct evm_ima_xattr_data **xattr_value); struct evm_ima_xattr_data **xattr_value, int xattr_len);
#else #else
static inline int ima_check_blacklist(struct integrity_iint_cache *iint, static inline int ima_check_blacklist(struct integrity_iint_cache *iint,
...@@ -372,7 +372,8 @@ ima_get_hash_algo(struct evm_ima_xattr_data *xattr_value, int xattr_len) ...@@ -372,7 +372,8 @@ ima_get_hash_algo(struct evm_ima_xattr_data *xattr_value, int xattr_len)
} }
static inline int ima_read_xattr(struct dentry *dentry, static inline int ima_read_xattr(struct dentry *dentry,
struct evm_ima_xattr_data **xattr_value) struct evm_ima_xattr_data **xattr_value,
int xattr_len)
{ {
return 0; return 0;
} }
......
...@@ -221,12 +221,12 @@ enum hash_algo ima_get_hash_algo(const struct evm_ima_xattr_data *xattr_value, ...@@ -221,12 +221,12 @@ enum hash_algo ima_get_hash_algo(const struct evm_ima_xattr_data *xattr_value,
} }
int ima_read_xattr(struct dentry *dentry, int ima_read_xattr(struct dentry *dentry,
struct evm_ima_xattr_data **xattr_value) struct evm_ima_xattr_data **xattr_value, int xattr_len)
{ {
ssize_t ret; int ret;
ret = vfs_getxattr_alloc(&init_user_ns, dentry, XATTR_NAME_IMA, ret = vfs_getxattr_alloc(&init_user_ns, dentry, XATTR_NAME_IMA,
(char **)xattr_value, 0, GFP_NOFS); (char **)xattr_value, xattr_len, GFP_NOFS);
if (ret == -EOPNOTSUPP) if (ret == -EOPNOTSUPP)
ret = 0; ret = 0;
return ret; return ret;
......
...@@ -293,7 +293,8 @@ static int process_measurement(struct file *file, const struct cred *cred, ...@@ -293,7 +293,8 @@ static int process_measurement(struct file *file, const struct cred *cred,
/* HASH sets the digital signature and update flags, nothing else */ /* HASH sets the digital signature and update flags, nothing else */
if ((action & IMA_HASH) && if ((action & IMA_HASH) &&
!(test_bit(IMA_DIGSIG, &iint->atomic_flags))) { !(test_bit(IMA_DIGSIG, &iint->atomic_flags))) {
xattr_len = ima_read_xattr(file_dentry(file), &xattr_value); xattr_len = ima_read_xattr(file_dentry(file),
&xattr_value, xattr_len);
if ((xattr_value && xattr_len > 2) && if ((xattr_value && xattr_len > 2) &&
(xattr_value->type == EVM_IMA_XATTR_DIGSIG)) (xattr_value->type == EVM_IMA_XATTR_DIGSIG))
set_bit(IMA_DIGSIG, &iint->atomic_flags); set_bit(IMA_DIGSIG, &iint->atomic_flags);
...@@ -316,7 +317,8 @@ static int process_measurement(struct file *file, const struct cred *cred, ...@@ -316,7 +317,8 @@ static int process_measurement(struct file *file, const struct cred *cred,
if ((action & IMA_APPRAISE_SUBMASK) || if ((action & IMA_APPRAISE_SUBMASK) ||
strcmp(template_desc->name, IMA_TEMPLATE_IMA_NAME) != 0) { strcmp(template_desc->name, IMA_TEMPLATE_IMA_NAME) != 0) {
/* read 'security.ima' */ /* read 'security.ima' */
xattr_len = ima_read_xattr(file_dentry(file), &xattr_value); xattr_len = ima_read_xattr(file_dentry(file),
&xattr_value, xattr_len);
/* /*
* Read the appended modsig if allowed by the policy, and allow * Read the appended modsig if allowed by the policy, and allow
......
...@@ -601,16 +601,15 @@ int ima_eventevmsig_init(struct ima_event_data *event_data, ...@@ -601,16 +601,15 @@ int ima_eventevmsig_init(struct ima_event_data *event_data,
rc = vfs_getxattr_alloc(&init_user_ns, file_dentry(event_data->file), rc = vfs_getxattr_alloc(&init_user_ns, file_dentry(event_data->file),
XATTR_NAME_EVM, (char **)&xattr_data, 0, XATTR_NAME_EVM, (char **)&xattr_data, 0,
GFP_NOFS); GFP_NOFS);
if (rc <= 0) if (rc <= 0 || xattr_data->type != EVM_XATTR_PORTABLE_DIGSIG) {
return 0; rc = 0;
goto out;
if (xattr_data->type != EVM_XATTR_PORTABLE_DIGSIG) {
kfree(xattr_data);
return 0;
} }
rc = ima_write_template_field_data((char *)xattr_data, rc, DATA_FMT_HEX, rc = ima_write_template_field_data((char *)xattr_data, rc, DATA_FMT_HEX,
field_data); field_data);
out:
kfree(xattr_data); kfree(xattr_data);
return rc; return rc;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment