From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751860AbdKLXQh (ORCPT ); Sun, 12 Nov 2017 18:16:37 -0500 Received: from mail-wm0-f67.google.com ([74.125.82.67]:53013 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751404AbdKLXP2 (ORCPT ); Sun, 12 Nov 2017 18:15:28 -0500 X-Google-Smtp-Source: AGs4zMYGEaiR1TWd88AKhuWMmFhO6ONHt8r0+nYyQI8Xn98zZEApYKchKH09yAmUmlnOEgWxv370pg== From: Rasmus Villemoes To: "David S. Miller" Cc: Rasmus Villemoes , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 4/7] net: core: drop pointless check in __dev_alloc_name Date: Mon, 13 Nov 2017 00:15:07 +0100 Message-Id: <20171112231511.4666-5-linux@rasmusvillemoes.dk> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171112231511.4666-1-linux@rasmusvillemoes.dk> References: <20171112231511.4666-1-linux@rasmusvillemoes.dk> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- net/core/dev.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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; -- 2.11.0