diff options
Diffstat (limited to 'kernel/audit.c')
| -rw-r--r-- | kernel/audit.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/kernel/audit.c b/kernel/audit.c index 963fd15c9621..f9889ee77825 100644 --- a/kernel/audit.c +++ b/kernel/audit.c | |||
| @@ -244,7 +244,7 @@ static int audit_set_rate_limit(int limit, uid_t loginuid, u32 sid) | |||
| 244 | char *ctx = NULL; | 244 | char *ctx = NULL; |
| 245 | u32 len; | 245 | u32 len; |
| 246 | int rc; | 246 | int rc; |
| 247 | if ((rc = selinux_ctxid_to_string(sid, &ctx, &len))) | 247 | if ((rc = selinux_sid_to_string(sid, &ctx, &len))) |
| 248 | return rc; | 248 | return rc; |
| 249 | else | 249 | else |
| 250 | audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE, | 250 | audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE, |
| @@ -267,7 +267,7 @@ static int audit_set_backlog_limit(int limit, uid_t loginuid, u32 sid) | |||
| 267 | char *ctx = NULL; | 267 | char *ctx = NULL; |
| 268 | u32 len; | 268 | u32 len; |
| 269 | int rc; | 269 | int rc; |
| 270 | if ((rc = selinux_ctxid_to_string(sid, &ctx, &len))) | 270 | if ((rc = selinux_sid_to_string(sid, &ctx, &len))) |
| 271 | return rc; | 271 | return rc; |
| 272 | else | 272 | else |
| 273 | audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE, | 273 | audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE, |
| @@ -293,7 +293,7 @@ static int audit_set_enabled(int state, uid_t loginuid, u32 sid) | |||
| 293 | char *ctx = NULL; | 293 | char *ctx = NULL; |
| 294 | u32 len; | 294 | u32 len; |
| 295 | int rc; | 295 | int rc; |
| 296 | if ((rc = selinux_ctxid_to_string(sid, &ctx, &len))) | 296 | if ((rc = selinux_sid_to_string(sid, &ctx, &len))) |
| 297 | return rc; | 297 | return rc; |
| 298 | else | 298 | else |
| 299 | audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE, | 299 | audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE, |
| @@ -321,7 +321,7 @@ static int audit_set_failure(int state, uid_t loginuid, u32 sid) | |||
| 321 | char *ctx = NULL; | 321 | char *ctx = NULL; |
| 322 | u32 len; | 322 | u32 len; |
| 323 | int rc; | 323 | int rc; |
| 324 | if ((rc = selinux_ctxid_to_string(sid, &ctx, &len))) | 324 | if ((rc = selinux_sid_to_string(sid, &ctx, &len))) |
| 325 | return rc; | 325 | return rc; |
| 326 | else | 326 | else |
| 327 | audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE, | 327 | audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE, |
| @@ -538,7 +538,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh) | |||
| 538 | if (status_get->mask & AUDIT_STATUS_PID) { | 538 | if (status_get->mask & AUDIT_STATUS_PID) { |
| 539 | int old = audit_pid; | 539 | int old = audit_pid; |
| 540 | if (sid) { | 540 | if (sid) { |
| 541 | if ((err = selinux_ctxid_to_string( | 541 | if ((err = selinux_sid_to_string( |
| 542 | sid, &ctx, &len))) | 542 | sid, &ctx, &len))) |
| 543 | return err; | 543 | return err; |
| 544 | else | 544 | else |
| @@ -576,7 +576,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh) | |||
| 576 | "user pid=%d uid=%u auid=%u", | 576 | "user pid=%d uid=%u auid=%u", |
| 577 | pid, uid, loginuid); | 577 | pid, uid, loginuid); |
| 578 | if (sid) { | 578 | if (sid) { |
| 579 | if (selinux_ctxid_to_string( | 579 | if (selinux_sid_to_string( |
| 580 | sid, &ctx, &len)) { | 580 | sid, &ctx, &len)) { |
| 581 | audit_log_format(ab, | 581 | audit_log_format(ab, |
| 582 | " ssid=%u", sid); | 582 | " ssid=%u", sid); |
| @@ -614,7 +614,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh) | |||
| 614 | loginuid, sid); | 614 | loginuid, sid); |
| 615 | break; | 615 | break; |
| 616 | case AUDIT_SIGNAL_INFO: | 616 | case AUDIT_SIGNAL_INFO: |
| 617 | err = selinux_ctxid_to_string(audit_sig_sid, &ctx, &len); | 617 | err = selinux_sid_to_string(audit_sig_sid, &ctx, &len); |
| 618 | if (err) | 618 | if (err) |
| 619 | return err; | 619 | return err; |
| 620 | sig_data = kmalloc(sizeof(*sig_data) + len, GFP_KERNEL); | 620 | sig_data = kmalloc(sizeof(*sig_data) + len, GFP_KERNEL); |