diff options
| author |   Konstantin Khlebnikov <k.khlebnikov@samsung.com> | 2014-08-07 20:52:33 +0400 |
|---|---|---|
| committer |   Casey Schaufler <casey@schaufler-ca.com> | 2014-08-08 14:50:19 -0700 |
| commit | fd5c9d230d2ac8a2594dfd15f0cca678fd7a64c7 (patch) | |
| tree | 966f6e10bb8069e34aba533a32f74390f06e92c3 | |
| parent | Merge tag 'keys-next-20140805' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next (diff) | |
| download | linux-dev-fd5c9d230d2ac8a2594dfd15f0cca678fd7a64c7.tar.xz linux-dev-fd5c9d230d2ac8a2594dfd15f0cca678fd7a64c7.zip | |
Smack: fix behavior of smack_inode_listsecurity
Security operation ->inode_listsecurity is used for generating list of
available extended attributes for syscall listxattr. Currently it's used
only in nfs4 or if filesystem doesn't provide i_op->listxattr.
The list is the set of NULL-terminated names, one after the other.
This method must include zero byte at the and into result.
Also this function must return length even if string does not fit into
output buffer or it is NULL, see similar method in selinux and man listxattr.
Signed-off-by: Konstantin Khlebnikov <k.khlebnikov@samsung.com>
| -rw-r--r-- | security/smack/smack_lsm.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c index e6ab307ce86e..b11ab23b328b 100644 --- a/security/smack/smack_lsm.c +++ b/security/smack/smack_lsm.c @@ -1122,13 +1122,12 @@ static int smack_inode_getsecurity(const struct inode *inode, static int smack_inode_listsecurity(struct inode *inode, char *buffer, size_t buffer_size) { - int len = strlen(XATTR_NAME_SMACK); + int len = sizeof(XATTR_NAME_SMACK); - if (buffer != NULL && len <= buffer_size) { + if (buffer != NULL && len <= buffer_size) memcpy(buffer, XATTR_NAME_SMACK, len); - return len; - } - return -EINVAL; + + return len; } /** |