aboutsummaryrefslogtreecommitdiffstats
path: root/security/smack/smack_lsm.c
diff options
context:
space:
mode:
Diffstat (limited to 'security/smack/smack_lsm.c')
-rw-r--r--security/smack/smack_lsm.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
index 4215971434e6..77ec16a3b68b 100644
--- a/security/smack/smack_lsm.c
+++ b/security/smack/smack_lsm.c
@@ -1242,7 +1242,7 @@ static void smack_set_catset(char *catset, struct netlbl_lsm_secattr *sap)
1242 int rc; 1242 int rc;
1243 int byte; 1243 int byte;
1244 1244
1245 if (catset == 0) 1245 if (!catset)
1246 return; 1246 return;
1247 1247
1248 sap->flags |= NETLBL_SECATTR_MLS_CAT; 1248 sap->flags |= NETLBL_SECATTR_MLS_CAT;
@@ -2495,6 +2495,7 @@ struct security_operations smack_ops = {
2495 .task_wait = smack_task_wait, 2495 .task_wait = smack_task_wait,
2496 .task_reparent_to_init = cap_task_reparent_to_init, 2496 .task_reparent_to_init = cap_task_reparent_to_init,
2497 .task_to_inode = smack_task_to_inode, 2497 .task_to_inode = smack_task_to_inode,
2498 .task_prctl = cap_task_prctl,
2498 2499
2499 .ipc_permission = smack_ipc_permission, 2500 .ipc_permission = smack_ipc_permission,
2500 2501