diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2021-04-08 15:33:55 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2021-04-08 15:33:55 +1000 |
| commit | 2b6cb67fd28f6b9ac22b50db769a3095a1f22f83 (patch) | |
| tree | 22379172882a561911bb5410bccba2d0229e1a36 /net/netlabel | |
| parent | d613c576af0d0cfbeb91b933b81c370fdf645894 (diff) | |
| parent | 1fb057dcde11b355fc9acde95cee3b2caa5dafb0 (diff) | |
| download | linux-next-2b6cb67fd28f6b9ac22b50db769a3095a1f22f83.tar.gz | |
Merge remote-tracking branch 'selinux/next'
Diffstat (limited to 'net/netlabel')
| -rw-r--r-- | net/netlabel/netlabel_unlabeled.c | 2 | ||||
| -rw-r--r-- | net/netlabel/netlabel_user.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/netlabel/netlabel_unlabeled.c b/net/netlabel/netlabel_unlabeled.c index ccb491642811..3e6ac9b790b1 100644 --- a/net/netlabel/netlabel_unlabeled.c +++ b/net/netlabel/netlabel_unlabeled.c @@ -1539,7 +1539,7 @@ int __init netlbl_unlabel_defconf(void) /* Only the kernel is allowed to call this function and the only time * it is called is at bootup before the audit subsystem is reporting * messages so don't worry to much about these values. */ - security_task_getsecid(current, &audit_info.secid); + security_task_getsecid_subj(current, &audit_info.secid); audit_info.loginuid = GLOBAL_ROOT_UID; audit_info.sessionid = 0; diff --git a/net/netlabel/netlabel_user.h b/net/netlabel/netlabel_user.h index 3c67afce64f1..b9ba8112b3c5 100644 --- a/net/netlabel/netlabel_user.h +++ b/net/netlabel/netlabel_user.h @@ -34,7 +34,7 @@ static inline void netlbl_netlink_auditinfo(struct sk_buff *skb, struct netlbl_audit *audit_info) { - security_task_getsecid(current, &audit_info->secid); + security_task_getsecid_subj(current, &audit_info->secid); audit_info->loginuid = audit_get_loginuid(current); audit_info->sessionid = audit_get_sessionid(current); } |