linux-kernel - Re: [RFC PATCH 08/14] af_netlink.c: make netlink

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

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <1310520819.2634.6.camel@edumazet-laptop>
Date:	Wed, 13 Jul 2011 03:33:39 +0200
From:	Eric Dumazet <eric.dumazet@...il.com>
To:	Serge Hallyn <serge@...lyn.com>
Cc:	linux-kernel@...r.kernel.org,
	containers@...ts.linux-foundation.org, dhowells@...hat.com,
	ebiederm@...ssion.com,
	"Serge E. Hallyn" <serge.hallyn@...onical.com>
Subject: Re: [RFC PATCH 08/14] af_netlink.c: make netlink_capable
 userns-aware

Le mardi 12 juillet 2011 à 23:30 +0000, Serge Hallyn a écrit :
> From: Serge E. Hallyn <serge.hallyn@...onical.com>
> 
> netlink_capable should check for permissions against the user
> namespace owning the socket in question.
> 
> Signed-off-by: Serge E. Hallyn <serge.hallyn@...onical.com>
> Cc: Eric W. Biederman <ebiederm@...ssion.com>
> ---
>  net/netlink/af_netlink.c |   11 +++++++++--
>  1 files changed, 9 insertions(+), 2 deletions(-)
> 
> diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
> index 6ef64ad..81c1099 100644
> --- a/net/netlink/af_netlink.c
> +++ b/net/netlink/af_netlink.c
> @@ -580,8 +580,15 @@ retry:
>  
>  static inline int netlink_capable(struct socket *sock, unsigned int flag)
>  {
> -	return (nl_table[sock->sk->sk_protocol].nl_nonroot & flag) ||
> -	       capable(CAP_NET_ADMIN);
> +	struct net *net;
> +	if (nl_table[sock->sk->sk_protocol].nl_nonroot & flag)
> +		return 1;
> +#ifdef CONFIG_NET_NS
> +	net = sock->sk->sk_net;
> +#else
> +	net = &init_net;
> +#endif

This is really ugly, please use :

	net = sock_net(sk);

And no more #ifdef



--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/