Message ID | 20171112231511.4666-5-linux@rasmusvillemoes.dk |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
Series | net: core: devname allocation cleanups | expand |
diff --git a/net/core/dev.c b/net/core/dev.c index 1077bfe97bde..14541b7a3195 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -1093,8 +1093,7 @@ static int __dev_alloc_name(struct net *net, const char *name, char *buf) free_page((unsigned long) inuse); } - if (buf != name) - snprintf(buf, IFNAMSIZ, name, i); + snprintf(buf, IFNAMSIZ, name, i); if (!__dev_get_by_name(net, buf)) return i;
The only caller passes a stack buffer as buf, so it won't equal the passed-in name. Moreover, we're already using buf as a scratch buffer inside the if (p) {} block, so if buf and name were the same, that snprintf() call would be overwriting its own format string. Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> --- net/core/dev.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)