{"id":818732,"url":"http://patchwork.ozlabs.org/api/patches/818732/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20170926163548.24347-2-phil@nwl.cc/","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/projects/7/?format=json","name":"Linux network development","link_name":"netdev","list_id":"netdev.vger.kernel.org","list_email":"netdev@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170926163548.24347-2-phil@nwl.cc>","list_archive_url":null,"date":"2017-09-26T16:35:46","name":"[iproute,v2,1/3] ip{6,}tunnel: Avoid copying user-supplied interface name around","commit_ref":null,"pull_url":null,"state":"changes-requested","archived":true,"hash":"f1acb9d1beae859e045f8980b82d8bed3ba73f75","submitter":{"id":4285,"url":"http://patchwork.ozlabs.org/api/people/4285/?format=json","name":"Phil Sutter","email":"phil@nwl.cc"},"delegate":{"id":389,"url":"http://patchwork.ozlabs.org/api/users/389/?format=json","username":"shemminger","first_name":"stephen","last_name":"hemminger","email":"shemminger@vyatta.com"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/20170926163548.24347-2-phil@nwl.cc/mbox/","series":[{"id":5182,"url":"http://patchwork.ozlabs.org/api/series/5182/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=5182","date":"2017-09-26T16:35:46","name":"Check user supplied interface name lengths","version":2,"mbox":"http://patchwork.ozlabs.org/series/5182/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/818732/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/818732/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=)","Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3y1mmS302Tz9t6C\n\tfor ;\n\tWed, 27 Sep 2017 02:36:08 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S937405AbdIZQgG (ORCPT );\n\tTue, 26 Sep 2017 12:36:06 -0400","from orbyte.nwl.cc ([151.80.46.58]:58106 \"EHLO orbyte.nwl.cc\"\n\trhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP\n\tid S934771AbdIZQgF (ORCPT );\n\tTue, 26 Sep 2017 12:36:05 -0400","from localhost ([::1]:52648 helo=xsao)\n\tby orbyte.nwl.cc with esmtp (Exim 4.89)\n\t(envelope-from )\n\tid 1dwsq4-0008HC-QP; Tue, 26 Sep 2017 18:36:04 +0200"],"From":"Phil Sutter ","To":"Stephen Hemminger ","Cc":"netdev@vger.kernel.org","Subject":"[iproute PATCH v2 1/3] ip{6,\n\t}tunnel: Avoid copying user-supplied interface name around","Date":"Tue, 26 Sep 2017 18:35:46 +0200","Message-Id":"<20170926163548.24347-2-phil@nwl.cc>","X-Mailer":"git-send-email 2.13.1","In-Reply-To":"<20170926163548.24347-1-phil@nwl.cc>","References":"<20170926163548.24347-1-phil@nwl.cc>","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"In both files' parse_args() functions as well as in iptunnel's do_prl()\nand do_6rd() functions, a user-supplied 'dev' parameter is uselessly\ncopied into a temporary buffer before passing it to ll_name_to_index()\nor copying into a struct ifreq. Avoid this by just caching the argv\npointer value until the later lookup/strcpy.\n\nSigned-off-by: Phil Sutter \n---\n ip/ip6tunnel.c | 6 +++---\n ip/iptunnel.c | 22 +++++++++-------------\n 2 files changed, 12 insertions(+), 16 deletions(-)","diff":"diff --git a/ip/ip6tunnel.c b/ip/ip6tunnel.c\nindex b4a7def144226..c12d700e74189 100644\n--- a/ip/ip6tunnel.c\n+++ b/ip/ip6tunnel.c\n@@ -136,7 +136,7 @@ static void print_tunnel(struct ip6_tnl_parm2 *p)\n static int parse_args(int argc, char **argv, int cmd, struct ip6_tnl_parm2 *p)\n {\n \tint count = 0;\n-\tchar medium[IFNAMSIZ] = {};\n+\tconst char *medium = NULL;\n \n \twhile (argc > 0) {\n \t\tif (strcmp(*argv, \"mode\") == 0) {\n@@ -180,7 +180,7 @@ static int parse_args(int argc, char **argv, int cmd, struct ip6_tnl_parm2 *p)\n \t\t\tmemcpy(&p->laddr, &laddr.data, sizeof(p->laddr));\n \t\t} else if (strcmp(*argv, \"dev\") == 0) {\n \t\t\tNEXT_ARG();\n-\t\t\tstrncpy(medium, *argv, IFNAMSIZ - 1);\n+\t\t\tmedium = *argv;\n \t\t} else if (strcmp(*argv, \"encaplimit\") == 0) {\n \t\t\tNEXT_ARG();\n \t\t\tif (strcmp(*argv, \"none\") == 0) {\n@@ -285,7 +285,7 @@ static int parse_args(int argc, char **argv, int cmd, struct ip6_tnl_parm2 *p)\n \t\tcount++;\n \t\targc--; argv++;\n \t}\n-\tif (medium[0]) {\n+\tif (medium) {\n \t\tp->link = ll_name_to_index(medium);\n \t\tif (p->link == 0) {\n \t\t\tfprintf(stderr, \"Cannot find device \\\"%s\\\"\\n\", medium);\ndiff --git a/ip/iptunnel.c b/ip/iptunnel.c\nindex 105d0f5576f1a..0acfd0793d3cd 100644\n--- a/ip/iptunnel.c\n+++ b/ip/iptunnel.c\n@@ -60,7 +60,7 @@ static void set_tunnel_proto(struct ip_tunnel_parm *p, int proto)\n static int parse_args(int argc, char **argv, int cmd, struct ip_tunnel_parm *p)\n {\n \tint count = 0;\n-\tchar medium[IFNAMSIZ] = {};\n+\tconst char *medium = NULL;\n \tint isatap = 0;\n \n \tmemset(p, 0, sizeof(*p));\n@@ -139,7 +139,7 @@ static int parse_args(int argc, char **argv, int cmd, struct ip_tunnel_parm *p)\n \t\t\t\tp->iph.saddr = htonl(INADDR_ANY);\n \t\t} else if (strcmp(*argv, \"dev\") == 0) {\n \t\t\tNEXT_ARG();\n-\t\t\tstrncpy(medium, *argv, IFNAMSIZ - 1);\n+\t\t\tmedium = *argv;\n \t\t} else if (strcmp(*argv, \"ttl\") == 0 ||\n \t\t\t strcmp(*argv, \"hoplimit\") == 0 ||\n \t\t\t strcmp(*argv, \"hlim\") == 0) {\n@@ -216,7 +216,7 @@ static int parse_args(int argc, char **argv, int cmd, struct ip_tunnel_parm *p)\n \t\t}\n \t}\n \n-\tif (medium[0]) {\n+\tif (medium) {\n \t\tp->link = ll_name_to_index(medium);\n \t\tif (p->link == 0) {\n \t\t\tfprintf(stderr, \"Cannot find device \\\"%s\\\"\\n\", medium);\n@@ -465,9 +465,8 @@ static int do_prl(int argc, char **argv)\n {\n \tstruct ip_tunnel_prl p = {};\n \tint count = 0;\n-\tint devname = 0;\n \tint cmd = 0;\n-\tchar medium[IFNAMSIZ] = {};\n+\tconst char *medium = NULL;\n \n \twhile (argc > 0) {\n \t\tif (strcmp(*argv, \"prl-default\") == 0) {\n@@ -488,8 +487,7 @@ static int do_prl(int argc, char **argv)\n \t\t\tcount++;\n \t\t} else if (strcmp(*argv, \"dev\") == 0) {\n \t\t\tNEXT_ARG();\n-\t\t\tstrncpy(medium, *argv, IFNAMSIZ-1);\n-\t\t\tdevname++;\n+\t\t\tmedium = *argv;\n \t\t} else {\n \t\t\tfprintf(stderr,\n \t\t\t\t\"Invalid PRL parameter \\\"%s\\\"\\n\", *argv);\n@@ -502,7 +500,7 @@ static int do_prl(int argc, char **argv)\n \t\t}\n \t\targc--; argv++;\n \t}\n-\tif (devname == 0) {\n+\tif (!medium) {\n \t\tfprintf(stderr, \"Must specify device\\n\");\n \t\texit(-1);\n \t}\n@@ -513,9 +511,8 @@ static int do_prl(int argc, char **argv)\n static int do_6rd(int argc, char **argv)\n {\n \tstruct ip_tunnel_6rd ip6rd = {};\n-\tint devname = 0;\n \tint cmd = 0;\n-\tchar medium[IFNAMSIZ] = {};\n+\tconst char *medium = NULL;\n \tinet_prefix prefix;\n \n \twhile (argc > 0) {\n@@ -537,8 +534,7 @@ static int do_6rd(int argc, char **argv)\n \t\t\tcmd = SIOCDEL6RD;\n \t\t} else if (strcmp(*argv, \"dev\") == 0) {\n \t\t\tNEXT_ARG();\n-\t\t\tstrncpy(medium, *argv, IFNAMSIZ-1);\n-\t\t\tdevname++;\n+\t\t\tmedium = *argv;\n \t\t} else {\n \t\t\tfprintf(stderr,\n \t\t\t\t\"Invalid 6RD parameter \\\"%s\\\"\\n\", *argv);\n@@ -546,7 +542,7 @@ static int do_6rd(int argc, char **argv)\n \t\t}\n \t\targc--; argv++;\n \t}\n-\tif (devname == 0) {\n+\tif (!medium) {\n \t\tfprintf(stderr, \"Must specify device\\n\");\n \t\texit(-1);\n \t}\n","prefixes":["iproute","v2","1/3"]}