git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Smack: remove unneeded NULL-termination from securtity label
[pandora-kernel.git]
/
security
/
smack
/
smack_lsm.c
diff --git
a/security/smack/smack_lsm.c
b/security/smack/smack_lsm.c
index
f2c3080
..
16ae853
100644
(file)
--- a/
security/smack/smack_lsm.c
+++ b/
security/smack/smack_lsm.c
@@
-672,7
+672,7
@@
static int smack_inode_init_security(struct inode *inode, struct inode *dir,
}
if (len)
}
if (len)
- *len = strlen(isp)
+ 1
;
+ *len = strlen(isp);
return 0;
}
return 0;
}
@@
-923,7
+923,7
@@
static int smack_inode_setxattr(struct dentry *dentry, const char *name,
rc = -EPERM;
if (rc == 0 && check_import) {
rc = -EPERM;
if (rc == 0 && check_import) {
- skp = s
mk_import_entry(value, size)
;
+ skp = s
ize ? smk_import_entry(value, size) : NULL
;
if (skp == NULL || (check_star &&
(skp == &smack_known_star || skp == &smack_known_web)))
rc = -EINVAL;
if (skp == NULL || (check_star &&
(skp == &smack_known_star || skp == &smack_known_web)))
rc = -EINVAL;
@@
-1076,7
+1076,7
@@
static int smack_inode_getsecurity(const struct inode *inode,
if (strcmp(name, XATTR_SMACK_SUFFIX) == 0) {
isp = smk_of_inode(inode);
if (strcmp(name, XATTR_SMACK_SUFFIX) == 0) {
isp = smk_of_inode(inode);
- ilen = strlen(isp)
+ 1
;
+ ilen = strlen(isp);
*buffer = isp;
return ilen;
}
*buffer = isp;
return ilen;
}
@@
-1101,7
+1101,7
@@
static int smack_inode_getsecurity(const struct inode *inode,
else
return -EOPNOTSUPP;
else
return -EOPNOTSUPP;
- ilen = strlen(isp)
+ 1
;
+ ilen = strlen(isp);
if (rc == 0) {
*buffer = isp;
rc = ilen;
if (rc == 0) {
*buffer = isp;
rc = ilen;
@@
-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)
{
static int smack_inode_listsecurity(struct inode *inode, char *buffer,
size_t buffer_size)
{
- int len = s
trlen
(XATTR_NAME_SMACK);
+ int len = s
izeof
(XATTR_NAME_SMACK);
- if (buffer != NULL && len <= buffer_size)
{
+ if (buffer != NULL && len <= buffer_size)
memcpy(buffer, XATTR_NAME_SMACK, len);
memcpy(buffer, XATTR_NAME_SMACK, len);
- return len;
- }
- return -EINVAL;
+
+ return len;
}
/**
}
/**
@@
-3209,9
+3208,9
@@
static struct smack_known *smack_from_secattr(struct netlbl_lsm_secattr *sap,
break;
}
for (acat = -1, kcat = -1; acat == kcat; ) {
break;
}
for (acat = -1, kcat = -1; acat == kcat; ) {
- acat = netlbl_
secattr_catmap_walk(
-
sap->attr.mls.cat,
acat + 1);
- kcat = netlbl_
secattr_
catmap_walk(
+ acat = netlbl_
catmap_walk(sap->attr.mls.cat,
+
acat + 1);
+ kcat = netlbl_catmap_walk(
skp->smk_netlabel.attr.mls.cat,
kcat + 1);
if (acat < 0 || kcat < 0)
skp->smk_netlabel.attr.mls.cat,
kcat + 1);
if (acat < 0 || kcat < 0)