diff options
| author | Pankaj Kumar <pankaj.k2@samsung.com> | 2013-12-13 15:12:22 +0530 |
|---|---|---|
| committer | Damian Hobson-Garcia <dhobsong@igel.co.jp> | 2014-12-11 16:53:27 +0900 |
| commit | 32ebb8d753dc61769dd476f8255e8ff976f62274 (patch) | |
| tree | 5042e526c1fcae16e36d78c9ca6859c7012adda5 | |
| parent | 10008b67222f8e467ec0bf55bbeae03fdbf24ecf (diff) | |
| download | renesas_kernel-32ebb8d753dc61769dd476f8255e8ff976f62274.tar.gz renesas_kernel-32ebb8d753dc61769dd476f8255e8ff976f62274.tar.bz2 renesas_kernel-32ebb8d753dc61769dd476f8255e8ff976f62274.zip | |
bugfix patch for SMACK
1. In order to remove any SMACK extended attribute from a file, a user
should have CAP_MAC_ADMIN capability. But user without having this
capability is able to remove SMACK64MMAP security attribute.
2. While validating size and value of smack extended attribute in
smack_inode_setsecurity hook, wrong error code is returned.
Change-Id: Ib4b290150f4a003733f76cbb7ccc25d228310ecb
Signed-off-by: Pankaj Kumar <pamkaj.k2@samsung.com>
Signed-off-by: Himanshu Shukla <himanshu.sh@samsung.com>
Signed-off-by: Rafal Krypa <r.krypa@samsung.com>
(cherry picked from commit d66caaa90217949d67ad82c4ba731b98d02adf76)
Signed-off-by: Damian Hobson-Garcia <dhobsong@igel.co.jp>
| -rw-r--r-- | security/smack/smack_lsm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c index d430977e91d..b86825b722d 100644 --- a/security/smack/smack_lsm.c +++ b/security/smack/smack_lsm.c @@ -1020,7 +1020,7 @@ static int smack_inode_removexattr(struct dentry *dentry, const char *name) strcmp(name, XATTR_NAME_SMACKIPOUT) == 0 || strcmp(name, XATTR_NAME_SMACKEXEC) == 0 || strcmp(name, XATTR_NAME_SMACKTRANSMUTE) == 0 || - strcmp(name, XATTR_NAME_SMACKMMAP)) { + strcmp(name, XATTR_NAME_SMACKMMAP) == 0) { if (!smack_privileged(CAP_MAC_ADMIN)) rc = -EPERM; } else @@ -2158,7 +2158,7 @@ static int smack_inode_setsecurity(struct inode *inode, const char *name, int rc = 0; if (value == NULL || size > SMK_LONGLABEL || size == 0) - return -EACCES; + return -EINVAL; skp = smk_import_entry(value, size); if (skp == NULL) |