kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

net: core: eliminate dev_alloc_name{,_ns} code duplication

Browse source 
dev_alloc_name contained a BUG_ON(), which I moved to dev_alloc_name_ns;
the only other caller of that already has the same BUG_ON.

Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Rasmus Villemoes 2017-11-13 00:15:06 +01:00 committed by David S. Miller
parent 2c88b85598
commit c46d7642e9
1 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
net/core/dev.c
View file

@ -1114,6 +1114,7 @@ static int dev_alloc_name_ns(struct net *net,
char buf[IFNAMSIZ]; char buf[IFNAMSIZ];
int ret; int ret;
BUG_ON(!net);
ret = __dev_alloc_name(net, name, buf); ret = __dev_alloc_name(net, name, buf);
if (ret >= 0) if (ret >= 0)
strlcpy(dev->name, buf, IFNAMSIZ); strlcpy(dev->name, buf, IFNAMSIZ);
@ -1136,16 +1137,7 @@ static int dev_alloc_name_ns(struct net *net,
int dev_alloc_name(struct net_device *dev, const char *name) int dev_alloc_name(struct net_device *dev, const char *name)
{ {
char buf[IFNAMSIZ]; return dev_alloc_name_ns(dev_net(dev), dev, name);
struct net *net;
int ret;
BUG_ON(!dev_net(dev));
net = dev_net(dev);
ret = __dev_alloc_name(net, name, buf);
if (ret >= 0)
strlcpy(dev->name, buf, IFNAMSIZ);
return ret;
} }
EXPORT_SYMBOL(dev_alloc_name); EXPORT_SYMBOL(dev_alloc_name);