lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Thu, 2 Jul 2020 12:26:32 +1200 From: Matt Bennett <matt.bennett@...iedtelesis.co.nz> To: netdev@...r.kernel.org Cc: zbr@...emap.net, ebiederm@...ssion.com, linux-kernel@...r.kernel.org, Matt Bennett <matt.bennett@...iedtelesis.co.nz> Subject: [PATCH 2/5] connector: Use 'current_user_ns' function In preparation for supporting the connector outside of the default network namespace we switch to using this function now. As the connector is still only supported in the default namespace this change is a no-op. Signed-off-by: Matt Bennett <matt.bennett@...iedtelesis.co.nz> --- drivers/connector/cn_proc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/connector/cn_proc.c b/drivers/connector/cn_proc.c index 36a7823c56ec..d90aea555a21 100644 --- a/drivers/connector/cn_proc.c +++ b/drivers/connector/cn_proc.c @@ -139,11 +139,11 @@ void proc_id_connector(struct task_struct *task, int which_id) rcu_read_lock(); cred = __task_cred(task); if (which_id == PROC_EVENT_UID) { - ev->event_data.id.r.ruid = from_kuid_munged(&init_user_ns, cred->uid); - ev->event_data.id.e.euid = from_kuid_munged(&init_user_ns, cred->euid); + ev->event_data.id.r.ruid = from_kuid_munged(current_user_ns(), cred->uid); + ev->event_data.id.e.euid = from_kuid_munged(current_user_ns(), cred->euid); } else if (which_id == PROC_EVENT_GID) { - ev->event_data.id.r.rgid = from_kgid_munged(&init_user_ns, cred->gid); - ev->event_data.id.e.egid = from_kgid_munged(&init_user_ns, cred->egid); + ev->event_data.id.r.rgid = from_kgid_munged(current_user_ns(), cred->gid); + ev->event_data.id.e.egid = from_kgid_munged(current_user_ns(), cred->egid); } else { rcu_read_unlock(); return; @@ -362,7 +362,7 @@ static void cn_proc_mcast_ctl(struct cn_msg *msg, return; /* Can only change if privileged. */ - if (!__netlink_ns_capable(nsp, &init_user_ns, CAP_NET_ADMIN)) { + if (!__netlink_ns_capable(nsp, current_user_ns(), CAP_NET_ADMIN)) { err = EPERM; goto out; } -- 2.27.0
Powered by blists - more mailing lists