From patchwork Sun Nov 12 23:15:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rasmus Villemoes X-Patchwork-Id: 837292 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="LvaNIDl6"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yZqQD3wkkz9t1G for ; Mon, 13 Nov 2017 10:16:04 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751535AbdKLXPd (ORCPT ); Sun, 12 Nov 2017 18:15:33 -0500 Received: from mail-wr0-f194.google.com ([209.85.128.194]:44007 "EHLO mail-wr0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751489AbdKLXPa (ORCPT ); Sun, 12 Nov 2017 18:15:30 -0500 Received: by mail-wr0-f194.google.com with SMTP id 4so12928657wrt.0 for ; Sun, 12 Nov 2017 15:15:29 -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=qsxZk48C6ei8f8/iPHI75R7ueY4gcARMTNRzYwiUlRc=; b=LvaNIDl64/flnFzLv4OL29E7qXRiIlfk73pVG324++7HQvEpSX8ple2XdKWmEaZxll j2UyyMN9NyzEfPWo8vhVCQdfZ0i7HlEBPhUCky+ORCvUtDL/hJ9NODg0YAQUQlpdOCTA BDIYM5nmgDJuVRNdXR6L+QGDC0R1IvHjUXJR0= 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=qsxZk48C6ei8f8/iPHI75R7ueY4gcARMTNRzYwiUlRc=; b=k+N8CgNoToEq+Nlf9GItYhaYV9VTxNG4mFeL5pcR9Y0Ye8SSfEqekarVq5oHGGKaPi dWGhgq/h1uvpbH1jkbpbkrLvuqYdaO7qurIDaopQFRS5PnvTfPaSb59LUxuZAh6yg0NE 2U6UT6qar1+yV8EMRMqS8sTYSW2SGGnLi3obebhnYooIHbHH2weU/V0CB0+ov6U/19yb vwgnYQpkO3eUOJTALh/ecIjFAVfdDgZ04uzKLrSri2DFUmbnJYYY1yglqOot2If2CVKF a18MRGO10s7HQJ3/9buYenSrxolNxFUtAZCfgQhn1Ulf+FYA5vQLHQzhx7tXxQQfmopA 7vaQ== X-Gm-Message-State: AJaThX78vU4bmyRFZ+7AUPhFaBgVFprht2aDt3lJJJYFn6bwAck3mM3P jgsfJOnbyqoI1fePHvRUA8xQlQ== X-Google-Smtp-Source: AGs4zMbHJ/6SAVcc/XRG38iQBR0tbyGttG90T1BLnVQxwFY6sY8y6MzRQ02qT52J33NbsLp/TeDOBQ== X-Received: by 10.223.154.202 with SMTP id a68mr5403403wrc.8.1510528528968; Sun, 12 Nov 2017 15:15:28 -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.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 12 Nov 2017 15:15:28 -0800 (PST) From: Rasmus Villemoes To: "David S. Miller" Cc: Rasmus Villemoes , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 5/7] net: core: check dev_valid_name in __dev_alloc_name Date: Mon, 13 Nov 2017 00:15:08 +0100 Message-Id: <20171112231511.4666-6-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 We currently only exclude non-sysfs-friendly names via dev_get_valid_name; there doesn't seem to be a reason to allow such names when we're called via dev_alloc_name. This does duplicate the dev_valid_name check in the dev_get_valid_name() case; we'll fix that shortly. Signed-off-by: Rasmus Villemoes --- net/core/dev.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/core/dev.c b/net/core/dev.c index 14541b7a3195..c0a92cf27566 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -1062,6 +1062,9 @@ static int __dev_alloc_name(struct net *net, const char *name, char *buf) unsigned long *inuse; struct net_device *d; + if (!dev_valid_name(name)) + return -EINVAL; + p = strchr(name, '%'); if (p) { /*