From patchwork Fri Nov 17 21:09:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 839153 X-Patchwork-Delegate: shemminger@vyatta.com 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 (2048-bit key; unprotected) header.d=networkplumber-org.20150623.gappssmtp.com header.i=@networkplumber-org.20150623.gappssmtp.com header.b="GMjAfeol"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3ydrNN08ZNz9s71 for ; Sat, 18 Nov 2017 08:09:56 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752707AbdKQVJx (ORCPT ); Fri, 17 Nov 2017 16:09:53 -0500 Received: from mail-pf0-f193.google.com ([209.85.192.193]:38453 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752655AbdKQVJu (ORCPT ); Fri, 17 Nov 2017 16:09:50 -0500 Received: by mail-pf0-f193.google.com with SMTP id r62so2790558pfd.5 for ; Fri, 17 Nov 2017 13:09:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=JLcGlIE1EfSv2h6krgELKir+C6MoK+w/viQyiUzp1hU=; b=GMjAfeolUFZ+sdcIn+0ok1CFWHgAT6qURo+niz5KHykW9CrxS7XkW3Ft/NlmDeHakm 7r8pOnBLXF9WYdGKCfu6Koz4+MkND1ipIICEE3jjxnbI+gMbCd5s964qWeWm6MLgATZm 7tQlPXIvV4WG5ZnYKF26iKPHpEF+xk6yzmtEu9eODHS775cH+rmMR5gQtBw+pwqQKKYR P8CB6OwVzPwB4zacGYvUqc00n5m/L1IRSy57dranZulriy6VDNWlGC8kOw2a9eucr2He 4DztjxDeJ+60W1RZ4ihoOIZ1p0xK1JvOWJnL51dFpe1RPwsyUmBJBnL8ZVjdexQL4n7t i9DA== 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=JLcGlIE1EfSv2h6krgELKir+C6MoK+w/viQyiUzp1hU=; b=ptKz+hbSfhtqEgBhwmuu/YyoL9WWqEBbOJ1Xq2l4msHcYDXvWIq+PwcoLxGbzkZ87I kcIK1qHTKjG8WX5IbAN4XAQXcX3UPP9rgBCmBGMqWF/ms0RG3EAzgDGRZbyxQDVTFFl2 OgwenVTyGIyh43SZxJYsqwJAJWeOi/zsvK10OOoAfw6hrzhf5UXMvL/p3rN9Gw5mwCYg f8PJwv+4E/h/iOsz1buiAqONAhOjnSNHwhDFA476ZHHyV3/TJT0sr04wJ1n5qnkrYBUT gvVzXJIriaMF33o20ffmlwJ/vBQEHB6sj5lVfMIpihiE5IILMpDMFBuhAhFaL8dFk3zH 4Fbw== X-Gm-Message-State: AJaThX5nDNefkzs4+RLNk/UnItVHEmhk5781jT8yNLRpMR2BpnjsAxR/ iMrZNzoGi6ESA5um3nSIpMQHn9VPaG4= X-Google-Smtp-Source: AGs4zMama99Vmk+ZdOL7bCNzCYd9bwLkKyeWYhZ0YPUTx4wVtuvTtuzdT0NkPokDQvIYMx4q+cDmOw== X-Received: by 10.98.31.142 with SMTP id l14mr3378646pfj.62.1510952989568; Fri, 17 Nov 2017 13:09:49 -0800 (PST) Received: from xeon-e3.lan (76-14-207-240.or.wavecable.com. [76.14.207.240]) by smtp.gmail.com with ESMTPSA id w73sm4663039pfd.86.2017.11.17.13.09.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 17 Nov 2017 13:09:48 -0800 (PST) From: Stephen Hemminger To: netdev@vger.kernel.org Cc: Stephen Hemminger Subject: [PATCH iproute2] tc: cleanup qdisc arg parsing Date: Fri, 17 Nov 2017 13:09:41 -0800 Message-Id: <20171117210941.25386-1-stephen@networkplumber.org> X-Mailer: git-send-email 2.11.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The qdisc arg parsing has magic limit of 16 for class which is not required by kernel. Also the limit of 16 for device name is really IFNAMSIZ. Signed-off-by: Stephen Hemminger --- tc/tc_qdisc.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/tc/tc_qdisc.c b/tc/tc_qdisc.c index fcb75f29128e..1066ae05a4b5 100644 --- a/tc/tc_qdisc.c +++ b/tc/tc_qdisc.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include #include @@ -49,8 +50,7 @@ static int tc_qdisc_modify(int cmd, unsigned int flags, int argc, char **argv) struct tc_sizespec szopts; __u16 *data; } stab = {}; - char d[16] = {}; - char k[16] = {}; + char d[IFNAMSIZ] = {}; struct { struct nlmsghdr n; struct tcmsg t; @@ -89,8 +89,8 @@ static int tc_qdisc_modify(int cmd, unsigned int flags, int argc, char **argv) return -1; } req.t.tcm_parent = TC_H_CLSACT; - strncpy(k, "clsact", sizeof(k) - 1); - q = get_qdisc_kind(k); + + q = get_qdisc_kind("clsact"); req.t.tcm_handle = TC_H_MAKE(TC_H_CLSACT, 0); NEXT_ARG_FWD(); break; @@ -100,8 +100,8 @@ static int tc_qdisc_modify(int cmd, unsigned int flags, int argc, char **argv) return -1; } req.t.tcm_parent = TC_H_INGRESS; - strncpy(k, "ingress", sizeof(k) - 1); - q = get_qdisc_kind(k); + + q = get_qdisc_kind("ingress"); req.t.tcm_handle = TC_H_MAKE(TC_H_INGRESS, 0); NEXT_ARG_FWD(); break; @@ -124,26 +124,23 @@ static int tc_qdisc_modify(int cmd, unsigned int flags, int argc, char **argv) } else if (matches(*argv, "help") == 0) { usage(); } else { - strncpy(k, *argv, sizeof(k)-1); - - q = get_qdisc_kind(k); + q = get_qdisc_kind(*argv); argc--; argv++; break; } argc--; argv++; } - if (k[0]) - addattr_l(&req.n, sizeof(req), TCA_KIND, k, strlen(k)+1); if (est.ewma_log) addattr_l(&req.n, sizeof(req), TCA_RATE, &est, sizeof(est)); if (q) { + addattr_l(&req.n, sizeof(req), TCA_KIND, q->id, strlen(q->id) + 1); if (q->parse_qopt) { if (q->parse_qopt(q, argc, argv, &req.n)) return 1; } else if (argc) { - fprintf(stderr, "qdisc '%s' does not support option parsing\n", k); + fprintf(stderr, "qdisc '%s' does not support option parsing\n", q->id); return -1; } } else {