lkml.org 
[lkml]   [2011]   [Jul]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [RFC PATCH 08/14] af_netlink.c: make netlink_capable userns-aware
From
Date
Le mardi 12 juillet 2011 à 23:30 +0000, Serge Hallyn a écrit :
> From: Serge E. Hallyn <serge.hallyn@canonical.com>
> netlink_capable should check for permissions against the user
> namespace owning the socket in question.
>
> Signed-off-by: Serge E. Hallyn <serge.hallyn@canonical.com>
> Cc: Eric W. Biederman <ebiederm@xmission.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@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2011-07-13 03:35    [from the cache]
©2003-2014 Jasper Spaans. Advertise on this site