summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Dichtel <nicolas.dichtel@6wind.com>2015-05-07 11:02:47 +0200
committerDavid S. Miller <davem@davemloft.net>2015-05-09 22:15:30 -0400
commit109582af18b9aade9385ea6609a792f80a7d70ca (patch)
tree41d02b858aef5ce2735ef71324290a6b3e115ec5
parent43996fdd9b5409dea7bdc73d8fe4e22ca25ccc39 (diff)
downloadlinux-109582af18b9aade9385ea6609a792f80a7d70ca.tar.gz
linux-109582af18b9aade9385ea6609a792f80a7d70ca.tar.bz2
linux-109582af18b9aade9385ea6609a792f80a7d70ca.zip
netns: returns always an id in __peernet2id()
All callers of this function expect a nsid, not an error. Thus, returns NETNSA_NSID_NOT_ASSIGNED in case of error so that callers don't have to convert the error to NETNSA_NSID_NOT_ASSIGNED. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Acked-by: Thomas Graf <tgraf@suug.ch> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/core/net_namespace.c19
1 files changed, 8 insertions, 11 deletions
diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c
index 78fc04ad36fc..294d38742e2a 100644
--- a/net/core/net_namespace.c
+++ b/net/core/net_namespace.c
@@ -192,10 +192,12 @@ static int __peernet2id(struct net *net, struct net *peer, bool alloc)
if (id > 0)
return id;
- if (alloc)
- return alloc_netid(net, peer, -1);
+ if (alloc) {
+ id = alloc_netid(net, peer, -1);
+ return id >= 0 ? id : NETNSA_NSID_NOT_ASSIGNED;
+ }
- return -ENOENT;
+ return NETNSA_NSID_NOT_ASSIGNED;
}
/* This function returns the id of a peer netns. If no id is assigned, one will
@@ -204,10 +206,8 @@ static int __peernet2id(struct net *net, struct net *peer, bool alloc)
int peernet2id(struct net *net, struct net *peer)
{
bool alloc = atomic_read(&peer->count) == 0 ? false : true;
- int id;
- id = __peernet2id(net, peer, alloc);
- return id >= 0 ? id : NETNSA_NSID_NOT_ASSIGNED;
+ return __peernet2id(net, peer, alloc);
}
EXPORT_SYMBOL(peernet2id);
@@ -554,13 +554,10 @@ static int rtnl_net_fill(struct sk_buff *skb, u32 portid, u32 seq, int flags,
rth = nlmsg_data(nlh);
rth->rtgen_family = AF_UNSPEC;
- if (nsid >= 0) {
+ if (nsid >= 0)
id = nsid;
- } else {
+ else
id = __peernet2id(net, peer, false);
- if (id < 0)
- id = NETNSA_NSID_NOT_ASSIGNED;
- }
if (nla_put_s32(skb, NETNSA_NSID, id))
goto nla_put_failure;