From patchwork Sun Nov 12 23:15:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rasmus Villemoes X-Patchwork-Id: 837291 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="R6WooPFB"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yZqPy5BmXz9s7m for ; Mon, 13 Nov 2017 10:15:50 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751646AbdKLXPo (ORCPT ); Sun, 12 Nov 2017 18:15:44 -0500 Received: from mail-wr0-f193.google.com ([209.85.128.193]:54835 "EHLO mail-wr0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751376AbdKLXPd (ORCPT ); Sun, 12 Nov 2017 18:15:33 -0500 Received: by mail-wr0-f193.google.com with SMTP id l22so12889778wrc.11 for ; Sun, 12 Nov 2017 15:15:33 -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=CfL5cxIzvunWTkcUQbevYPKtc1a6oS+SSPG9PBYu+vo=; b=R6WooPFBjaSAlvBVJ7FEnVdDxO44bZvLMtdzcwsfJpriD1b35KmdONtTl4il+X4dN3 K/Nj8XFSuKx1KFgJMp5ffPoGavEXE1YuQJ1bOq6ntf6rDRFtrA6/Grqt8RIINwI0tDLt 8rDccdgWEZMn0IM0ejHAEeFDQ55bqoR9bxtYQ= 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=CfL5cxIzvunWTkcUQbevYPKtc1a6oS+SSPG9PBYu+vo=; b=TEzxrLMC1kC8YcXohDk/6/yR58i8+p+z3mY5WhX31G/6uzOzQxLffy8D4TRheSQVgc Xomb/tnL9uzMxpLp1pK8enotY9YuhaW00+Xzyz1oZk9v1hIS7iPW8JktKtFwQajeDjPq n0yLuVBQkTzlU4GSClOaZay16cNeuh4Wv7VZFG1GwCUJRCMeZexA6rrq5GoWms02a+sk 4uhKAxwBtF3msG/RJFFOvouyXkmj94QGNdhI6imSC+qyeOTYB2mAh9lzcReixXcY1e7H InugTmsuGzGGQyB6n3J1+4S27vd5XYeF88n9qQuvL+bNgI/njYnw9BXnD/Dj7pDpZYyO D/Cw== X-Gm-Message-State: AJaThX4NXtmo0LZWVfNWjy0fWn88gd1tyHLdjOv2oxlPsXzxFrAiAWP2 gefTObj8GlbwKfPK5DvqoJNdCw== X-Google-Smtp-Source: AGs4zMYpCmyshbCKstyIu/Goe1NwuCOfZtUuabQQsEv2mntJKU6sME1Rygs7EKW7LIZ5kchBa9Q1pA== X-Received: by 10.223.191.17 with SMTP id p17mr5290355wrh.184.1510528532482; Sun, 12 Nov 2017 15:15:32 -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.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 12 Nov 2017 15:15:32 -0800 (PST) From: Rasmus Villemoes To: "David S. Miller" Cc: Rasmus Villemoes , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 7/7] net: core: dev_get_valid_name is now the same as dev_alloc_name_ns Date: Mon, 13 Nov 2017 00:15:10 +0100 Message-Id: <20171112231511.4666-8-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 If name contains a %, it's easy to see that this patch doesn't change anything (other than eliminate the duplicate dev_valid_name call). Otherwise, we'll now just spend a little time in snprintf() copying name to the stack buffer allocated in dev_alloc_name_ns, and do the __dev_get_by_name using that buffer rather than name. Signed-off-by: Rasmus Villemoes --- net/core/dev.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/net/core/dev.c b/net/core/dev.c index 7c08b4ca7b76..e29eea26f9c1 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -1144,19 +1144,7 @@ EXPORT_SYMBOL(dev_alloc_name); int dev_get_valid_name(struct net *net, struct net_device *dev, const char *name) { - BUG_ON(!net); - - if (!dev_valid_name(name)) - return -EINVAL; - - if (strchr(name, '%')) - return dev_alloc_name_ns(net, dev, name); - else if (__dev_get_by_name(net, name)) - return -EEXIST; - else if (dev->name != name) - strlcpy(dev->name, name, IFNAMSIZ); - - return 0; + return dev_alloc_name_ns(net, dev, name); } EXPORT_SYMBOL(dev_get_valid_name);