From: Serhey Popovych <serhe.popovych@gmail.com>
To: netdev@vger.kernel.org
Subject: [PATCH iproute2 3/3] iplink: Kill redundant network device name checks
Date: Mon, 18 Dec 2017 20:54:08 +0200 [thread overview]
Message-ID: <1513623248-7689-4-git-send-email-serhe.popovych@gmail.com> (raw)
In-Reply-To: <1513623248-7689-1-git-send-email-serhe.popovych@gmail.com>
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 <serhe.popovych@gmail.com>
---
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
prev parent reply other threads:[~2017-12-18 18:55 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-18 18:54 [PATCH iproute2 0/3] Improve iplink index, alias and name parameters handling Serhey Popovych
2017-12-18 18:54 ` [PATCH iproute2 1/3] iplink: Improve index parameter handling Serhey Popovych
2017-12-18 19:23 ` Stephen Hemminger
2017-12-18 21:02 ` Serhey Popovich
2017-12-18 21:22 ` Stephen Hemminger
2017-12-18 21:37 ` Serhey Popovich
2017-12-19 15:59 ` Stephen Hemminger
2017-12-19 16:05 ` Serhey Popovich
2017-12-18 18:54 ` [PATCH iproute2 2/3] iplink: Process "alias" parameter correctly Serhey Popovych
2017-12-18 18:54 ` Serhey Popovych [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1513623248-7689-4-git-send-email-serhe.popovych@gmail.com \
--to=serhe.popovych@gmail.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).