From: Vadim Kochan <[email protected]>
Added new NL80211_ATTR_NETNS_FD which allows to
set namespace via nl80211 by fd.
Signed-off-by: Vadim Kochan <[email protected]>
---
include/uapi/linux/nl80211.h | 2 ++
net/core/net_namespace.c | 1 +
net/wireless/nl80211.c | 16 +++++++++++-----
3 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/include/uapi/linux/nl80211.h b/include/uapi/linux/nl80211.h
index a963d48..47757cb 100644
--- a/include/uapi/linux/nl80211.h
+++ b/include/uapi/linux/nl80211.h
@@ -2098,6 +2098,8 @@ enum nl80211_attrs {
NL80211_ATTR_SURVEY_RADIO_STATS,
+ NL80211_ATTR_NETNS_FD,
+
/* add attributes here, update the policy in nl80211.c */
__NL80211_ATTR_AFTER_LAST,
diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c
index 7f15517..5d5ee8f 100644
--- a/net/core/net_namespace.c
+++ b/net/core/net_namespace.c
@@ -361,6 +361,7 @@ struct net *get_net_ns_by_fd(int fd)
return ERR_PTR(-EINVAL);
}
#endif
+EXPORT_SYMBOL_GPL(get_net_ns_by_fd);
struct net *get_net_ns_by_pid(pid_t pid)
{
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 7c2ce26..dfa3284 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -397,6 +397,7 @@ static const struct nla_policy nl80211_policy[NUM_NL80211_ATTR] = {
[NL80211_ATTR_SMPS_MODE] = { .type = NLA_U8 },
[NL80211_ATTR_MAC_MASK] = { .len = ETH_ALEN },
[NL80211_ATTR_WIPHY_SELF_MANAGED_REG] = { .type = NLA_FLAG },
+ [NL80211_ATTR_NETNS_FD] = { .type = NLA_U32 },
};
/* policy for the key attributes */
@@ -7744,14 +7745,19 @@ static int nl80211_wiphy_netns(struct sk_buff *skb, struct genl_info *info)
struct cfg80211_registered_device *rdev = info->user_ptr[0];
struct net *net;
int err;
- u32 pid;
- if (!info->attrs[NL80211_ATTR_PID])
- return -EINVAL;
+ if (info->attrs[NL80211_ATTR_PID]) {
+ u32 pid = nla_get_u32(info->attrs[NL80211_ATTR_PID]);
+
+ net = get_net_ns_by_pid(pid);
+ } else if (info->attrs[NL80211_ATTR_NETNS_FD]) {
+ u32 fd = nla_get_u32(info->attrs[NL80211_ATTR_NETNS_FD]);
- pid = nla_get_u32(info->attrs[NL80211_ATTR_PID]);
+ net = get_net_ns_by_fd(fd);
+ } else {
+ return -EINVAL;
+ }
- net = get_net_ns_by_pid(pid);
if (IS_ERR(net))
return PTR_ERR(net);
--
2.1.3
On Wed, Jan 14, 2015 at 09:47:26AM +0100, Johannes Berg wrote:
> On Mon, 2015-01-12 at 16:34 +0200, Vadim Kochan wrote:
>
> > --- a/net/core/net_namespace.c
> > +++ b/net/core/net_namespace.c
> > @@ -361,6 +361,7 @@ struct net *get_net_ns_by_fd(int fd)
> > return ERR_PTR(-EINVAL);
> > }
> > #endif
> > +EXPORT_SYMBOL_GPL(get_net_ns_by_fd);
>
> Does this seem OK? Vadim is adding support for using the ns-by-fd in
> nl80211, which can be a module as part of cfg80211.
>
> johannes
>
PING ... in case if this email was missed ...
Thanks,
On Fri, 2015-01-23 at 12:50 +0200, Vadim Kochan wrote:
> I have changes for 'iw' for setting netns by name in the same way as it
> works in 'ip link set dev XXX netns <NAME>', so it uses /var/run/netns
> path by default or absolute path if it sees "/" in the netns name.
>
> So may be I will send the patch as RFC just to see a feedback ?
Sure, sounds good.
johannes
On Fri, Jan 23, 2015 at 10:51:44AM +0100, Johannes Berg wrote:
> On Mon, 2015-01-12 at 16:34 +0200, Vadim Kochan wrote:
> > From: Vadim Kochan <[email protected]>
> >
> > Added new NL80211_ATTR_NETNS_FD which allows to
> > set namespace via nl80211 by fd.
>
> Applied.
>
> johannes
>
Hi,
I have changes for 'iw' for setting netns by name in the same way as it
works in 'ip link set dev XXX netns <NAME>', so it uses /var/run/netns
path by default or absolute path if it sees "/" in the netns name.
So may be I will send the patch as RFC just to see a feedback ?
Thanks,
On Mon, Jan 19, 2015 at 04:34:57PM +0200, Vadim Kochan wrote:
> On Wed, Jan 14, 2015 at 09:47:26AM +0100, Johannes Berg wrote:
> > On Mon, 2015-01-12 at 16:34 +0200, Vadim Kochan wrote:
> >
> > > --- a/net/core/net_namespace.c
> > > +++ b/net/core/net_namespace.c
> > > @@ -361,6 +361,7 @@ struct net *get_net_ns_by_fd(int fd)
> > > return ERR_PTR(-EINVAL);
> > > }
> > > #endif
> > > +EXPORT_SYMBOL_GPL(get_net_ns_by_fd);
> >
> > Does this seem OK? Vadim is adding support for using the ns-by-fd in
> > nl80211, which can be a module as part of cfg80211.
> >
> > johannes
> >
> PING ... in case if this email was missed ...
>
> Thanks,
Hi Johannes,
Does it mean that patch will be rejected in case if no one answer on
this ?:)
Thanks,
On Mon, 2015-01-12 at 16:34 +0200, Vadim Kochan wrote:
> From: Vadim Kochan <[email protected]>
>
> Added new NL80211_ATTR_NETNS_FD which allows to
> set namespace via nl80211 by fd.
Applied.
johannes
On Mon, 2015-01-12 at 16:34 +0200, Vadim Kochan wrote:
> --- a/net/core/net_namespace.c
> +++ b/net/core/net_namespace.c
> @@ -361,6 +361,7 @@ struct net *get_net_ns_by_fd(int fd)
> return ERR_PTR(-EINVAL);
> }
> #endif
> +EXPORT_SYMBOL_GPL(get_net_ns_by_fd);
Does this seem OK? Vadim is adding support for using the ns-by-fd in
nl80211, which can be a module as part of cfg80211.
johannes
On Thu, 2015-01-22 at 13:32 +0200, Vadim Kochan wrote:
> On Mon, Jan 19, 2015 at 04:34:57PM +0200, Vadim Kochan wrote:
> > On Wed, Jan 14, 2015 at 09:47:26AM +0100, Johannes Berg wrote:
> > > On Mon, 2015-01-12 at 16:34 +0200, Vadim Kochan wrote:
> > >
> > > > --- a/net/core/net_namespace.c
> > > > +++ b/net/core/net_namespace.c
> > > > @@ -361,6 +361,7 @@ struct net *get_net_ns_by_fd(int fd)
> > > > return ERR_PTR(-EINVAL);
> > > > }
> > > > #endif
> > > > +EXPORT_SYMBOL_GPL(get_net_ns_by_fd);
> > >
> > > Does this seem OK? Vadim is adding support for using the ns-by-fd in
> > > nl80211, which can be a module as part of cfg80211.
> > >
> > > johannes
> > >
> > PING ... in case if this email was missed ...
> >
> > Thanks,
>
> Hi Johannes,
>
> Does it mean that patch will be rejected in case if no one answer on
> this ?:)
Nah, I'll eventually take it :)
johannes