| Message ID | 20171112231511.4666-4-linux@rasmusvillemoes.dk |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | net: core: devname allocation cleanups | expand |
From: Rasmus Villemoes > Sent: 12 November 2017 23:15 > 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> > --- > net/core/dev.c | 12 ++---------- > 1 file changed, 2 insertions(+), 10 deletions(-) > > diff --git a/net/core/dev.c b/net/core/dev.c > index 240ae6bc1097..1077bfe97bde 100644 > --- a/net/core/dev.c > +++ b/net/core/dev.c > @@ -1112,6 +1112,7 @@ static int dev_alloc_name_ns(struct net *net, > char buf[IFNAMSIZ]; > int ret; > > + BUG_ON(!net); > ret = __dev_alloc_name(net, name, buf); Just delete it. The NULL pointer dereference is as easy to debug as the BUG(). David
diff --git a/net/core/dev.c b/net/core/dev.c index 240ae6bc1097..1077bfe97bde 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -1112,6 +1112,7 @@ static int dev_alloc_name_ns(struct net *net, char buf[IFNAMSIZ]; int ret; + BUG_ON(!net); ret = __dev_alloc_name(net, name, buf); if (ret >= 0) strlcpy(dev->name, buf, IFNAMSIZ); @@ -1134,16 +1135,7 @@ static int dev_alloc_name_ns(struct net *net, int dev_alloc_name(struct net_device *dev, const char *name) { - char buf[IFNAMSIZ]; - 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; + return dev_alloc_name_ns(dev_net(dev), dev, name); } EXPORT_SYMBOL(dev_alloc_name);
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> --- net/core/dev.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-)