From mboxrd@z Thu Jan 1 00:00:00 1970 From: Serhey Popovych Subject: [PATCH iproute2 3/3] iplink: Kill redundant network device name checks Date: Mon, 18 Dec 2017 20:54:08 +0200 Message-ID: <1513623248-7689-4-git-send-email-serhe.popovych@gmail.com> References: <1513623248-7689-1-git-send-email-serhe.popovych@gmail.com> To: netdev@vger.kernel.org Return-path: Received: from mail-lf0-f68.google.com ([209.85.215.68]:36229 "EHLO mail-lf0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933036AbdLRSzE (ORCPT ); Mon, 18 Dec 2017 13:55:04 -0500 Received: by mail-lf0-f68.google.com with SMTP id f20so18936365lfe.3 for ; Mon, 18 Dec 2017 10:55:03 -0800 (PST) Received: from tuxracer.localdomain ([2a01:6d80::195:20:96:53]) by smtp.gmail.com with ESMTPSA id y26sm1916932lfk.85.2017.12.18.10.55.01 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Dec 2017 10:55:02 -0800 (PST) In-Reply-To: <1513623248-7689-1-git-send-email-serhe.popovych@gmail.com> Sender: netdev-owner@vger.kernel.org List-ID: Since commit 625df645b703 (Check user supplied interface name lengths) iplink_parse() validates network device name using check_ifname() helpers. Remove redundant "name" length checks from iplink_parse() callers. Signed-off-by: Serhey Popovych --- ip/iplink_vxcan.c | 8 +++----- ip/link_veth.c | 8 +++----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/ip/iplink_vxcan.c b/ip/iplink_vxcan.c index 680f640..c13224c 100644 --- a/ip/iplink_vxcan.c +++ b/ip/iplink_vxcan.c @@ -38,7 +38,7 @@ static int vxcan_parse_opt(struct link_util *lu, int argc, char **argv, char *link = NULL; char *type = NULL; int index = 0; - int err, len; + int err; struct rtattr *data; int group; struct ifinfomsg *ifm, *peer_ifm; @@ -66,10 +66,8 @@ static int vxcan_parse_opt(struct link_util *lu, int argc, char **argv, return err; if (name) { - len = strlen(name) + 1; - if (len > IFNAMSIZ) - invarg("\"name\" too long\n", *argv); - addattr_l(hdr, 1024, IFLA_IFNAME, name, len); + addattr_l(hdr, 1024, + IFLA_IFNAME, name, strlen(name) + 1); } peer_ifm = RTA_DATA(data); diff --git a/ip/link_veth.c b/ip/link_veth.c index a368827..fcfd1ef 100644 --- a/ip/link_veth.c +++ b/ip/link_veth.c @@ -36,7 +36,7 @@ static int veth_parse_opt(struct link_util *lu, int argc, char **argv, char *link = NULL; char *type = NULL; int index = 0; - int err, len; + int err; struct rtattr *data; int group; struct ifinfomsg *ifm, *peer_ifm; @@ -64,10 +64,8 @@ static int veth_parse_opt(struct link_util *lu, int argc, char **argv, return err; if (name) { - len = strlen(name) + 1; - if (len > IFNAMSIZ) - invarg("\"name\" too long\n", *argv); - addattr_l(hdr, 1024, IFLA_IFNAME, name, len); + addattr_l(hdr, 1024, + IFLA_IFNAME, name, strlen(name) + 1); } peer_ifm = RTA_DATA(data); -- 1.7.10.4