diff options
Diffstat (limited to 'security/smack')
-rw-r--r-- | security/smack/smack_lsm.c | 2 | ||||
-rw-r--r-- | security/smack/smackfs.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c index 5d2ec5650e61..92baee53a7dc 100644 --- a/security/smack/smack_lsm.c +++ b/security/smack/smack_lsm.c | |||
@@ -2406,7 +2406,7 @@ static int smack_secid_to_secctx(u32 secid, char **secdata, u32 *seclen) | |||
2406 | * | 2406 | * |
2407 | * Exists for audit and networking code. | 2407 | * Exists for audit and networking code. |
2408 | */ | 2408 | */ |
2409 | static int smack_secctx_to_secid(char *secdata, u32 seclen, u32 *secid) | 2409 | static int smack_secctx_to_secid(const char *secdata, u32 seclen, u32 *secid) |
2410 | { | 2410 | { |
2411 | *secid = smack_to_secid(secdata); | 2411 | *secid = smack_to_secid(secdata); |
2412 | return 0; | 2412 | return 0; |
diff --git a/security/smack/smackfs.c b/security/smack/smackfs.c index a5da5a8cfe9b..271a835fbbe3 100644 --- a/security/smack/smackfs.c +++ b/security/smack/smackfs.c | |||
@@ -324,6 +324,7 @@ static void smk_cipso_doi(void) | |||
324 | struct netlbl_audit audit_info; | 324 | struct netlbl_audit audit_info; |
325 | 325 | ||
326 | audit_info.loginuid = audit_get_loginuid(current); | 326 | audit_info.loginuid = audit_get_loginuid(current); |
327 | audit_info.sessionid = audit_get_sessionid(current); | ||
327 | audit_info.secid = smack_to_secid(current->security); | 328 | audit_info.secid = smack_to_secid(current->security); |
328 | 329 | ||
329 | rc = netlbl_cfg_map_del(NULL, &audit_info); | 330 | rc = netlbl_cfg_map_del(NULL, &audit_info); |
@@ -356,6 +357,7 @@ static void smk_unlbl_ambient(char *oldambient) | |||
356 | struct netlbl_audit audit_info; | 357 | struct netlbl_audit audit_info; |
357 | 358 | ||
358 | audit_info.loginuid = audit_get_loginuid(current); | 359 | audit_info.loginuid = audit_get_loginuid(current); |
360 | audit_info.sessionid = audit_get_sessionid(current); | ||
359 | audit_info.secid = smack_to_secid(current->security); | 361 | audit_info.secid = smack_to_secid(current->security); |
360 | 362 | ||
361 | if (oldambient != NULL) { | 363 | if (oldambient != NULL) { |