From patchwork Sun Nov 12 23:15:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rasmus Villemoes X-Patchwork-Id: 837295 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=rasmusvillemoes.dk header.i=@rasmusvillemoes.dk header.b="F9S2L8GX"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yZqRD1WhFz9s7m for ; Mon, 13 Nov 2017 10:16:56 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751868AbdKLXQw (ORCPT ); Sun, 12 Nov 2017 18:16:52 -0500 Received: from mail-wm0-f68.google.com ([74.125.82.68]:51418 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751403AbdKLXP2 (ORCPT ); Sun, 12 Nov 2017 18:15:28 -0500 Received: by mail-wm0-f68.google.com with SMTP id b189so5009454wmd.0 for ; Sun, 12 Nov 2017 15:15:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rasmusvillemoes.dk; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=HBSwLYS02XWW08OXj1N3HYNmgfAi+FntN1Pl8w5eRrU=; b=F9S2L8GXmnvuJ0gWmcz7RH0KzH624/jGv55H7dGfyVwIPRxGLZtDbW9FTTUuUT90hE RSnPEDRaSoCy2RUVCxDhkWeyceMDq2axaIciQK/RsNkWHo1yC0Woo4rZYZG5OrJSInJI z7H4FHDyHFrQSMJPXhheq1WWlfd4MzsHttNtI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=HBSwLYS02XWW08OXj1N3HYNmgfAi+FntN1Pl8w5eRrU=; b=HWza37izSemjCy9yervjNtKrleY/+5lsAOiHzKehMYrW8zCyONybbo83eW6AID4mjF KasyVrgKIG225/FEdl+QxDOz9bPQPirZZIYTRQe55A+OCCf1WiWcMyL9hjQ1jdsljMOh v0CDxxqBfcSQGJOk84drYabReWCWPqSZxPmPHj4Eh8katO0GSw4CowmxgfZ6eGm5m5pP 59ma7pnoW9OxMWC3tg3WuDNG4EVD5/1eyCA2R1oArdN6eHzpel5RtkNH0RGZqO2XMS3p IG41Id3Ajc9X4wnSO8r2UpnYZF56HrkWn5XkPRE3/5YvAGN6fTTf5W7FChn1k6t2hND/ deTQ== X-Gm-Message-State: AJaThX7ylPrulTDMEvTSZStLrepx3zzn3v9DjF8WQt3uH5o4Hdo4h36R ax2SHfKP5+BSTSP8vF/C9IfBS00y X-Google-Smtp-Source: AGs4zMYGEaiR1TWd88AKhuWMmFhO6ONHt8r0+nYyQI8Xn98zZEApYKchKH09yAmUmlnOEgWxv370pg== X-Received: by 10.28.20.213 with SMTP id 204mr4440291wmu.132.1510528527291; Sun, 12 Nov 2017 15:15:27 -0800 (PST) Received: from wildmoose.dk ([2a01:488:66:1000:57e6:57d1:0:1]) by smtp.gmail.com with ESMTPSA id o70sm48012169wrb.62.2017.11.12.15.15.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 12 Nov 2017 15:15:26 -0800 (PST) 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: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@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;