Skip to content

Commit 2a862b3

Browse files
a-darwishJames Morris
a-darwish
authored and
James Morris
committed
Audit: use new LSM hooks instead of SELinux exports
Stop using the following exported SELinux interfaces: selinux_get_inode_sid(inode, sid) selinux_get_ipc_sid(ipcp, sid) selinux_get_task_sid(tsk, sid) selinux_sid_to_string(sid, ctx, len) kfree(ctx) and use following generic LSM equivalents respectively: security_inode_getsecid(inode, secid) security_ipc_getsecid*(ipcp, secid) security_task_getsecid(tsk, secid) security_sid_to_secctx(sid, ctx, len) security_release_secctx(ctx, len) Call security_release_secctx only if security_secid_to_secctx succeeded. Signed-off-by: Casey Schaufler <casey@schaufler-ca.com> Signed-off-by: Ahmed S. Darwish <darwish.07@gmail.com> Acked-by: James Morris <jmorris@namei.org> Reviewed-by: Paul Moore <paul.moore@hp.com>
1 parent 713a04a commit 2a862b3

File tree

3 files changed

+43
-37
lines changed

3 files changed

+43
-37
lines changed

‎kernel/audit.c

+9-8
Original file line numberDiff line numberDiff line change
@@ -265,13 +265,13 @@ static int audit_log_config_change(char *function_name, int new, int old,
265265
char *ctx = NULL;
266266
u32 len;
267267

268-
rc = selinux_sid_to_string(sid, &ctx, &len);
268+
rc = security_secid_to_secctx(sid, &ctx, &len);
269269
if (rc) {
270270
audit_log_format(ab, " sid=%u", sid);
271271
allow_changes = 0; /* Something weird, deny request */
272272
} else {
273273
audit_log_format(ab, " subj=%s", ctx);
274-
kfree(ctx);
274+
security_release_secctx(ctx, len);
275275
}
276276
}
277277
audit_log_format(ab, " res=%d", allow_changes);
@@ -550,12 +550,13 @@ static int audit_log_common_recv_msg(struct audit_buffer **ab, u16 msg_type,
550550
audit_log_format(*ab, "user pid=%d uid=%u auid=%u",
551551
pid, uid, auid);
552552
if (sid) {
553-
rc = selinux_sid_to_string(sid, &ctx, &len);
553+
rc = security_secid_to_secctx(sid, &ctx, &len);
554554
if (rc)
555555
audit_log_format(*ab, " ssid=%u", sid);
556-
else
556+
else {
557557
audit_log_format(*ab, " subj=%s", ctx);
558-
kfree(ctx);
558+
security_release_secctx(ctx, len);
559+
}
559560
}
560561

561562
return rc;
@@ -758,18 +759,18 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
758759
break;
759760
}
760761
case AUDIT_SIGNAL_INFO:
761-
err = selinux_sid_to_string(audit_sig_sid, &ctx, &len);
762+
err = security_secid_to_secctx(audit_sig_sid, &ctx, &len);
762763
if (err)
763764
return err;
764765
sig_data = kmalloc(sizeof(*sig_data) + len, GFP_KERNEL);
765766
if (!sig_data) {
766-
kfree(ctx);
767+
security_release_secctx(ctx, len);
767768
return -ENOMEM;
768769
}
769770
sig_data->uid = audit_sig_uid;
770771
sig_data->pid = audit_sig_pid;
771772
memcpy(sig_data->ctx, ctx, len);
772-
kfree(ctx);
773+
security_release_secctx(ctx, len);
773774
audit_send_reply(NETLINK_CB(skb).pid, seq, AUDIT_SIGNAL_INFO,
774775
0, 0, sig_data, sizeof(*sig_data) + len);
775776
kfree(sig_data);

‎kernel/auditfilter.c

+5-3
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
#include <linux/netlink.h>
2929
#include <linux/sched.h>
3030
#include <linux/inotify.h>
31+
#include <linux/security.h>
3132
#include <linux/selinux.h>
3233
#include "audit.h"
3334

@@ -1515,11 +1516,12 @@ static void audit_log_rule_change(uid_t loginuid, u32 sid, char *action,
15151516
if (sid) {
15161517
char *ctx = NULL;
15171518
u32 len;
1518-
if (selinux_sid_to_string(sid, &ctx, &len))
1519+
if (security_secid_to_secctx(sid, &ctx, &len))
15191520
audit_log_format(ab, " ssid=%u", sid);
1520-
else
1521+
else {
15211522
audit_log_format(ab, " subj=%s", ctx);
1522-
kfree(ctx);
1523+
security_release_secctx(ctx, len);
1524+
}
15231525
}
15241526
audit_log_format(ab, " op=%s rule key=", action);
15251527
if (rule->filterkey)

‎kernel/auditsc.c

+29-26
Original file line numberDiff line numberDiff line change
@@ -530,7 +530,7 @@ static int audit_filter_rules(struct task_struct *tsk,
530530
logged upon error */
531531
if (f->se_rule) {
532532
if (need_sid) {
533-
selinux_get_task_sid(tsk, &sid);
533+
security_task_getsecid(tsk, &sid);
534534
need_sid = 0;
535535
}
536536
result = selinux_audit_rule_match(sid, f->type,
@@ -885,19 +885,19 @@ void audit_log_task_context(struct audit_buffer *ab)
885885
int error;
886886
u32 sid;
887887

888-
selinux_get_task_sid(current, &sid);
888+
security_task_getsecid(current, &sid);
889889
if (!sid)
890890
return;
891891

892-
error = selinux_sid_to_string(sid, &ctx, &len);
892+
error = security_secid_to_secctx(sid, &ctx, &len);
893893
if (error) {
894894
if (error != -EINVAL)
895895
goto error_path;
896896
return;
897897
}
898898

899899
audit_log_format(ab, " subj=%s", ctx);
900-
kfree(ctx);
900+
security_release_secctx(ctx, len);
901901
return;
902902

903903
error_path:
@@ -941,7 +941,7 @@ static int audit_log_pid_context(struct audit_context *context, pid_t pid,
941941
u32 sid, char *comm)
942942
{
943943
struct audit_buffer *ab;
944-
char *s = NULL;
944+
char *ctx = NULL;
945945
u32 len;
946946
int rc = 0;
947947

@@ -951,15 +951,16 @@ static int audit_log_pid_context(struct audit_context *context, pid_t pid,
951951

952952
audit_log_format(ab, "opid=%d oauid=%d ouid=%d oses=%d", pid, auid,
953953
uid, sessionid);
954-
if (selinux_sid_to_string(sid, &s, &len)) {
954+
if (security_secid_to_secctx(sid, &ctx, &len)) {
955955
audit_log_format(ab, " obj=(none)");
956956
rc = 1;
957-
} else
958-
audit_log_format(ab, " obj=%s", s);
957+
} else {
958+
audit_log_format(ab, " obj=%s", ctx);
959+
security_release_secctx(ctx, len);
960+
}
959961
audit_log_format(ab, " ocomm=");
960962
audit_log_untrustedstring(ab, comm);
961963
audit_log_end(ab);
962-
kfree(s);
963964

964965
return rc;
965966
}
@@ -1271,14 +1272,15 @@ static void audit_log_exit(struct audit_context *context, struct task_struct *ts
12711272
if (axi->osid != 0) {
12721273
char *ctx = NULL;
12731274
u32 len;
1274-
if (selinux_sid_to_string(
1275+
if (security_secid_to_secctx(
12751276
axi->osid, &ctx, &len)) {
12761277
audit_log_format(ab, " osid=%u",
12771278
axi->osid);
12781279
call_panic = 1;
1279-
} else
1280+
} else {
12801281
audit_log_format(ab, " obj=%s", ctx);
1281-
kfree(ctx);
1282+
security_release_secctx(ctx, len);
1283+
}
12821284
}
12831285
break; }
12841286

@@ -1392,13 +1394,14 @@ static void audit_log_exit(struct audit_context *context, struct task_struct *ts
13921394
if (n->osid != 0) {
13931395
char *ctx = NULL;
13941396
u32 len;
1395-
if (selinux_sid_to_string(
1397+
if (security_secid_to_secctx(
13961398
n->osid, &ctx, &len)) {
13971399
audit_log_format(ab, " osid=%u", n->osid);
13981400
call_panic = 2;
1399-
} else
1401+
} else {
14001402
audit_log_format(ab, " obj=%s", ctx);
1401-
kfree(ctx);
1403+
security_release_secctx(ctx, len);
1404+
}
14021405
}
14031406

14041407
audit_log_end(ab);
@@ -1775,7 +1778,7 @@ static void audit_copy_inode(struct audit_names *name, const struct inode *inode
17751778
name->uid = inode->i_uid;
17761779
name->gid = inode->i_gid;
17771780
name->rdev = inode->i_rdev;
1778-
selinux_get_inode_sid(inode, &name->osid);
1781+
security_inode_getsecid(inode, &name->osid);
17791782
}
17801783

17811784
/**
@@ -2190,8 +2193,7 @@ int __audit_ipc_obj(struct kern_ipc_perm *ipcp)
21902193
ax->uid = ipcp->uid;
21912194
ax->gid = ipcp->gid;
21922195
ax->mode = ipcp->mode;
2193-
selinux_get_ipc_sid(ipcp, &ax->osid);
2194-
2196+
security_ipc_getsecid(ipcp, &ax->osid);
21952197
ax->d.type = AUDIT_IPC;
21962198
ax->d.next = context->aux;
21972199
context->aux = (void *)ax;
@@ -2343,7 +2345,7 @@ void __audit_ptrace(struct task_struct *t)
23432345
context->target_auid = audit_get_loginuid(t);
23442346
context->target_uid = t->uid;
23452347
context->target_sessionid = audit_get_sessionid(t);
2346-
selinux_get_task_sid(t, &context->target_sid);
2348+
security_task_getsecid(t, &context->target_sid);
23472349
memcpy(context->target_comm, t->comm, TASK_COMM_LEN);
23482350
}
23492351

@@ -2371,7 +2373,7 @@ int __audit_signal_info(int sig, struct task_struct *t)
23712373
audit_sig_uid = tsk->loginuid;
23722374
else
23732375
audit_sig_uid = tsk->uid;
2374-
selinux_get_task_sid(tsk, &audit_sig_sid);
2376+
security_task_getsecid(tsk, &audit_sig_sid);
23752377
}
23762378
if (!audit_signals || audit_dummy_context())
23772379
return 0;
@@ -2384,7 +2386,7 @@ int __audit_signal_info(int sig, struct task_struct *t)
23842386
ctx->target_auid = audit_get_loginuid(t);
23852387
ctx->target_uid = t->uid;
23862388
ctx->target_sessionid = audit_get_sessionid(t);
2387-
selinux_get_task_sid(t, &ctx->target_sid);
2389+
security_task_getsecid(t, &ctx->target_sid);
23882390
memcpy(ctx->target_comm, t->comm, TASK_COMM_LEN);
23892391
return 0;
23902392
}
@@ -2405,7 +2407,7 @@ int __audit_signal_info(int sig, struct task_struct *t)
24052407
axp->target_auid[axp->pid_count] = audit_get_loginuid(t);
24062408
axp->target_uid[axp->pid_count] = t->uid;
24072409
axp->target_sessionid[axp->pid_count] = audit_get_sessionid(t);
2408-
selinux_get_task_sid(t, &axp->target_sid[axp->pid_count]);
2410+
security_task_getsecid(t, &axp->target_sid[axp->pid_count]);
24092411
memcpy(axp->target_comm[axp->pid_count], t->comm, TASK_COMM_LEN);
24102412
axp->pid_count++;
24112413

@@ -2435,16 +2437,17 @@ void audit_core_dumps(long signr)
24352437
ab = audit_log_start(NULL, GFP_KERNEL, AUDIT_ANOM_ABEND);
24362438
audit_log_format(ab, "auid=%u uid=%u gid=%u ses=%u",
24372439
auid, current->uid, current->gid, sessionid);
2438-
selinux_get_task_sid(current, &sid);
2440+
security_task_getsecid(current, &sid);
24392441
if (sid) {
24402442
char *ctx = NULL;
24412443
u32 len;
24422444

2443-
if (selinux_sid_to_string(sid, &ctx, &len))
2445+
if (security_secid_to_secctx(sid, &ctx, &len))
24442446
audit_log_format(ab, " ssid=%u", sid);
2445-
else
2447+
else {
24462448
audit_log_format(ab, " subj=%s", ctx);
2447-
kfree(ctx);
2449+
security_release_secctx(ctx, len);
2450+
}
24482451
}
24492452
audit_log_format(ab, " pid=%d comm=", current->pid);
24502453
audit_log_untrustedstring(ab, current->comm);

0 commit comments

Comments
 (0)