From patchwork Mon Feb 11 18:49:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tonghao Zhang X-Patchwork-Id: 1041761 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@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; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="QRwQVJNB"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 440KqT0k63z9s1l for ; Thu, 14 Feb 2019 13:20:20 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391815AbfBNCUS (ORCPT ); Wed, 13 Feb 2019 21:20:18 -0500 Received: from mail-pl1-f196.google.com ([209.85.214.196]:34001 "EHLO mail-pl1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728365AbfBNCUS (ORCPT ); Wed, 13 Feb 2019 21:20:18 -0500 Received: by mail-pl1-f196.google.com with SMTP id w4so2266401plz.1 for ; Wed, 13 Feb 2019 18:20:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=9Kg2j9A2neVUYIBn6Tk0J73xyr+Q6zokNakAfvghJDI=; b=QRwQVJNBixDLX1U2RbKC/1rMQYk+Wqs9AWRZNCWHcnqR+Z/h9K3I+/VkDzGPvlcXOe IR+7lloWzEDRoLQfJA2IjnBNc/YnjDNLoVWnJQzhls3pb8H7YNysfHWs2m+V/rrdiiM+ EDu/6mkjKjZc/02FVjttGt8G6nFN8NQSIMvgnwA6nAIvH1cG8GPmq0BXnCHh+lTxNq9V iuSerpgRWRezUozSJHd8yUsZFwWKwik/Nj7ZDVhpDIJ49x7urutaAQ1dH6E8WEHqUP5C A70o/3mu8HOQaWU9HWbsDxda2zdo6NDT1C7lEbbodIs3FF5eD/DcdB9FPG3a7d8SyOJs /BVw== 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; bh=9Kg2j9A2neVUYIBn6Tk0J73xyr+Q6zokNakAfvghJDI=; b=V3mXppw41Oynxf+Gvkqa34tUGqXvDF8jjqPVoVobvgalUdKiuck5qGnS1bL5gsgg3d k0rK4t09VKy7BdnutxH/nYi28LgIohNs5j6be/Uw+mhqvf7jV/dg9LrTJKLS91LlWomw i9walI+6X2JDAfCrMKqrE5C5hu9vNy1Szxw4DvsKSAcp3lqYh2VRxAQELqzoGrCjiOwv WL2OLZX76tH+vIqWcKAfpCXfVanPEzmah/o10pHjk8x9Exbh4jl4TnTIUFQObhAqnPaY 6/ItsTkLw0JqtjzSyWwkaeP6xkAnGvz6loLwmyN56ujCHYvJ+/+cdH+yTDz843QUjgWM lAfw== X-Gm-Message-State: AHQUAuYF80Dr+CmK2PDggLyoCWjy51uk9kLcWG+YR46m6PBWx9rN9e3Q 6KdFRzXO2FOD5lD35Fi40ng= X-Google-Smtp-Source: AHgI3IbZdXIcGHQnc479eTHphn0gDgIwCCB71lzm3PsWHmnPC5JV6CRR8NAyM7ORvqRkbPcdoCLEbw== X-Received: by 2002:a17:902:42e:: with SMTP id 43mr223504ple.88.1550110817696; Wed, 13 Feb 2019 18:20:17 -0800 (PST) Received: from local.opencloud.tech.localdomain ([203.100.54.194]) by smtp.gmail.com with ESMTPSA id n25sm865402pfi.173.2019.02.13.18.20.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Feb 2019 18:20:17 -0800 (PST) From: xiangxia.m.yue@gmail.com To: davem@davemloft.net Cc: netdev@vger.kernel.org, Tonghao Zhang Subject: [PATCH net-next v2] bonding: check slave set command firstly Date: Mon, 11 Feb 2019 10:49:48 -0800 Message-Id: <1549910988-40999-1-git-send-email-xiangxia.m.yue@gmail.com> X-Mailer: git-send-email 1.8.3.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Tonghao Zhang This patch is a little improvement. If user use the command shown as below, we should print the info [1] instead of [2]. The eth0 exists actually, and it may confuse user. $ echo "eth0" > /sys/class/net/bond4/bonding/slaves [1] "bond4: no command found in slaves file - use +ifname or -ifname" [2] "write error: No such device" Signed-off-by: Tonghao Zhang --- v2: fix compiling warning. --- drivers/net/bonding/bond_options.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/bonding/bond_options.c b/drivers/net/bonding/bond_options.c index 4d5d01c..da1fc17 100644 --- a/drivers/net/bonding/bond_options.c +++ b/drivers/net/bonding/bond_options.c @@ -1375,6 +1375,7 @@ static int bond_option_slaves_set(struct bonding *bond, sscanf(newval->string, "%16s", command); /* IFNAMSIZ*/ ifname = command + 1; if ((strlen(command) <= 1) || + (command[0] != '+' && command[0] != '-') || !dev_valid_name(ifname)) goto err_no_cmd; @@ -1398,6 +1399,7 @@ static int bond_option_slaves_set(struct bonding *bond, break; default: + /* should not run here. */ goto err_no_cmd; }