Patch Detail

HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 56657,
    "url": "https://patches.dpdk.org/api/patches/56657/?format=api",
    "web_url": "https://patches.dpdk.org/project/dpdk/patch/20190717184945.4025-1-stephen@networkplumber.org/",
    "project": {
        "id": 1,
        "url": "https://patches.dpdk.org/api/projects/1/?format=api",
        "name": "DPDK",
        "link_name": "dpdk",
        "list_id": "dev.dpdk.org",
        "list_email": "dev@dpdk.org",
        "web_url": "http://core.dpdk.org",
        "scm_url": "git://dpdk.org/dpdk",
        "webscm_url": "http://git.dpdk.org/dpdk",
        "list_archive_url": "https://inbox.dpdk.org/dev",
        "list_archive_url_format": "https://inbox.dpdk.org/dev/{}",
        "commit_url_format": ""
    },
    "msgid": "<20190717184945.4025-1-stephen@networkplumber.org>",
    "list_archive_url": "https://inbox.dpdk.org/dev/20190717184945.4025-1-stephen@networkplumber.org",
    "date": "2019-07-17T18:49:45",
    "name": "[RFC] net: be more restrictive in ether_unformat_addr",
    "commit_ref": null,
    "pull_url": null,
    "state": "superseded",
    "archived": true,
    "hash": "085a087a8dc650418d74420bb4c89ed16226c88e",
    "submitter": {
        "id": 27,
        "url": "https://patches.dpdk.org/api/people/27/?format=api",
        "name": "Stephen Hemminger",
        "email": "stephen@networkplumber.org"
    },
    "delegate": {
        "id": 319,
        "url": "https://patches.dpdk.org/api/users/319/?format=api",
        "username": "fyigit",
        "first_name": "Ferruh",
        "last_name": "Yigit",
        "email": "ferruh.yigit@amd.com"
    },
    "mbox": "https://patches.dpdk.org/project/dpdk/patch/20190717184945.4025-1-stephen@networkplumber.org/mbox/",
    "series": [
        {
            "id": 5575,
            "url": "https://patches.dpdk.org/api/series/5575/?format=api",
            "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=5575",
            "date": "2019-07-17T18:49:45",
            "name": "[RFC] net: be more restrictive in ether_unformat_addr",
            "version": 1,
            "mbox": "https://patches.dpdk.org/series/5575/mbox/"
        }
    ],
    "comments": "https://patches.dpdk.org/api/patches/56657/comments/",
    "check": "warning",
    "checks": "https://patches.dpdk.org/api/patches/56657/checks/",
    "tags": {},
    "related": [],
    "headers": {
        "Return-Path": "<dev-bounces@dpdk.org>",
        "X-Original-To": "patchwork@dpdk.org",
        "Delivered-To": "patchwork@dpdk.org",
        "Received": [
            "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 631E91BDF5;\n\tWed, 17 Jul 2019 20:49:50 +0200 (CEST)",
            "from mail-pl1-f195.google.com (mail-pl1-f195.google.com\n\t[209.85.214.195]) by dpdk.org (Postfix) with ESMTP id 87AB11BDEA\n\tfor <dev@dpdk.org>; Wed, 17 Jul 2019 20:49:49 +0200 (CEST)",
            "by mail-pl1-f195.google.com with SMTP id i2so12455227plt.1\n\tfor <dev@dpdk.org>; Wed, 17 Jul 2019 11:49:49 -0700 (PDT)",
            "from localhost.localdomain ([67.23.203.6])\n\tby smtp.gmail.com with ESMTPSA id\n\t81sm40241352pfx.111.2019.07.17.11.49.47\n\t(version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256);\n\tWed, 17 Jul 2019 11:49:47 -0700 (PDT)"
        ],
        "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=networkplumber-org.20150623.gappssmtp.com; s=20150623;\n\th=from:to:cc:subject:date:message-id;\n\tbh=ytxlBDwgESjloV2KtSIYF2HhCv5QzC4VcShXhokGOTY=;\n\tb=xP1G8yP14viHw6ZqY20UiwODatHhcAz4bJb1NBQ37Myie+ixN7imrBQggam/sYibCS\n\t9ScQhQhxbCS0vYjTztsaxLYv96A9OaHm13Ah5oeH3XyBWMhVdp39L324u0++EP5Uzwyh\n\tSbmSZTiPiqnauoYs6+HCC9y0ZK0KP5H1fNt9mDgEQTRDqsnqQbpRYrnyKAsg71WWIgJu\n\to3X35Nc/wfV78RxeIg2WoO6whJqFyT/83OlFWF/yInRElArspjnGus6IZY7VC8F4QFeF\n\tXJwwv4tflS7Lva2VtWQgInc/3fswp038ladttMHX1T7lXEjDhhgLs+nlyU89vQ8My7rP\n\t39Ew==",
        "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id;\n\tbh=ytxlBDwgESjloV2KtSIYF2HhCv5QzC4VcShXhokGOTY=;\n\tb=d5MaWK6X3Y1z6nTCM9jwGauq83j/WsqgbojZ16uMU5F01Z0q7yrTZ9xEMGNTuBIin/\n\t6UoSiPgmxteqd6mAswoAg/cf1hD8TmIjAiqMBsbZa4hLjEWEzt2yrf78Y4VMI9uGV/6c\n\trQmrl8kOik0rWu1MYIAbzqwfH8HHQOVElKQ0O7h/dn0QqTJpHrk2rShFp+xzEtC/OKNs\n\tGhsJkuI1nnq0leU4Kgp+6XSmtIfEIRZbaAGaKBc7ln/yuMqY7fbIzJhdCdBeXntkakbT\n\tuOJMP9l9x2QoD8piK4Hm88dxHA83gXxAhfgv//a/kbBSyjv5Yty4lC1bria7ViY+7yqz\n\tNzjg==",
        "X-Gm-Message-State": "APjAAAWYGwonz5B/zNz+N5H3mFFkEJSrxq6I41tvxEshMXDcA99OqvFk\n\tdhaJlP6oG31iR001Cuv5h0ciJHEA",
        "X-Google-Smtp-Source": "APXvYqzOMN53gOfzQaZMKNNWi5sbDca8uZ6wC1x/J6NSukK4FDLtzwopfK5p8pSW8hDITITZssGCpQ==",
        "X-Received": "by 2002:a17:902:b28b:: with SMTP id\n\tu11mr43153029plr.11.1563389388311; \n\tWed, 17 Jul 2019 11:49:48 -0700 (PDT)",
        "From": "Stephen Hemminger <stephen@networkplumber.org>",
        "To": "dev@dpdk.org",
        "Cc": "Stephen Hemminger <stephen@networkplumber.org>",
        "Date": "Wed, 17 Jul 2019 11:49:45 -0700",
        "Message-Id": "<20190717184945.4025-1-stephen@networkplumber.org>",
        "X-Mailer": "git-send-email 2.17.1",
        "Subject": "[dpdk-dev] [RFC] net: be more restrictive in ether_unformat_addr",
        "X-BeenThere": "dev@dpdk.org",
        "X-Mailman-Version": "2.1.15",
        "Precedence": "list",
        "List-Id": "DPDK patches and discussions <dev.dpdk.org>",
        "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>",
        "List-Archive": "<http://mails.dpdk.org/archives/dev/>",
        "List-Post": "<mailto:dev@dpdk.org>",
        "List-Help": "<mailto:dev-request@dpdk.org?subject=help>",
        "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>",
        "Errors-To": "dev-bounces@dpdk.org",
        "Sender": "\"dev\" <dev-bounces@dpdk.org>"
    },
    "content": "The current code acts more like BSD ether_aton and allows leading zeros\nwhich breaks the cmdline tests.\n\nChange the code to be more restrictive and only allow the fully\nexpanded standard formats.\n\nFixes: 596d31092d32 (\"net: add function to convert string to ethernet address\")\nSigned-off-by: Stephen Hemminger <stephen@networkplumber.org>\n---\n lib/librte_net/rte_ether.c | 107 ++++++++++++++++++++++++-------------\n 1 file changed, 70 insertions(+), 37 deletions(-)",
    "diff": "diff --git a/lib/librte_net/rte_ether.c b/lib/librte_net/rte_ether.c\nindex 8d040173cfc6..536449beffe4 100644\n--- a/lib/librte_net/rte_ether.c\n+++ b/lib/librte_net/rte_ether.c\n@@ -2,6 +2,8 @@\n  * Copyright(c) 2010-2014 Intel Corporation\n  */\n \n+#include <stdbool.h>\n+\n #include <rte_ether.h>\n #include <rte_errno.h>\n \n@@ -29,50 +31,81 @@ rte_ether_format_addr(char *buf, uint16_t size,\n \t\t eth_addr->addr_bytes[5]);\n }\n \n+static int8_t get_xdigit(char ch)\n+{\n+\tif (ch >= '0' && ch <= '9')\n+\t\treturn ch - '0';\n+\tif (ch >= 'a' && ch <= 'f')\n+\t\treturn ch - 'a' + 10;\n+\tif (ch >= 'A' && ch <= 'F')\n+\t\treturn ch - 'A' + 10;\n+\treturn -1;\n+}\n+\n+/* Convert 00:11:22:33:44:55 to ethernet address */\n+static bool get_ether_addr6(const char *s0, struct rte_ether_addr *ea)\n+{\n+\tconst char *s = s0;\n+\tint i;\n+\n+\tfor (i = 0; i < RTE_ETHER_ADDR_LEN; i++) {\n+\t\tint8_t x;\n+\n+\t\tx = get_xdigit(*s++);\n+\t\tif (x < 0)\n+\t\t\treturn false;\n+\t\tea->addr_bytes[i] = x << 4;\n+\t\tx = get_xdigit(*s++);\n+\t\tif (x < 0)\n+\t\t\treturn false;\n+\t\tea->addr_bytes[i] |= x;\n+\n+\t\tif (i < RTE_ETHER_ADDR_LEN - 1 &&\n+\t\t    *s++ != ':')\n+\t\t\treturn false;\n+\t}\n+\treturn *s == '\\0';\n+}\n+\n+/* Convert 0011:2233:4455 to ethernet address */\n+static bool get_ether_addr3(const char *s, struct rte_ether_addr *ea)\n+{\n+\tint i, j;\n+\n+\tfor (i = 0; i < RTE_ETHER_ADDR_LEN; i += 2) {\n+\t\tuint16_t w = 0;\n+\n+\t\tfor (j = 0; j < 4; j++) {\n+\t\t\tint8_t x;\n+\n+\t\t\tx = get_xdigit(*s++);\n+\t\t\tif (x < 0)\n+\t\t\t\treturn false;\n+\t\t\tw = (w << 4) | x;\n+\t\t}\n+\t\tea->addr_bytes[i] = w >> 8;\n+\t\tea->addr_bytes[i+1] = w & 0xff;\n+\n+\t\tif (i < RTE_ETHER_ADDR_LEN - 2 &&\n+\t\t    *s++ != ':')\n+\t\t\treturn false;\n+\t}\n+\n+\treturn *s == '\\0';\n+}\n+\n /*\n  * Like ether_aton_r but can handle either\n  * XX:XX:XX:XX:XX:XX or XXXX:XXXX:XXXX\n+ * and is more restrictive.\n  */\n int\n rte_ether_unformat_addr(const char *s, struct rte_ether_addr *ea)\n {\n-\tunsigned int o0, o1, o2, o3, o4, o5;\n-\tint n;\n-\n-\tn = sscanf(s, \"%x:%x:%x:%x:%x:%x\",\n-\t\t    &o0, &o1, &o2, &o3, &o4, &o5);\n-\n-\tif (n == 6) {\n-\t\t/* Standard format XX:XX:XX:XX:XX:XX */\n-\t\tif (o0 > UINT8_MAX || o1 > UINT8_MAX || o2 > UINT8_MAX ||\n-\t\t    o3 > UINT8_MAX || o4 > UINT8_MAX || o5 > UINT8_MAX) {\n-\t\t\trte_errno = ERANGE;\n-\t\t\treturn -1;\n-\t\t}\n-\n-\t\tea->addr_bytes[0] = o0;\n-\t\tea->addr_bytes[1] = o1;\n-\t\tea->addr_bytes[2] = o2;\n-\t\tea->addr_bytes[3] = o3;\n-\t\tea->addr_bytes[4] = o4;\n-\t\tea->addr_bytes[5] = o5;\n-\t} else if (n == 3) {\n-\t\t/* Support the format XXXX:XXXX:XXXX */\n-\t\tif (o0 > UINT16_MAX || o1 > UINT16_MAX || o2 > UINT16_MAX) {\n-\t\t\trte_errno = ERANGE;\n-\t\t\treturn -1;\n-\t\t}\n-\n-\t\tea->addr_bytes[0] = o0 >> 8;\n-\t\tea->addr_bytes[1] = o0 & 0xff;\n-\t\tea->addr_bytes[2] = o1 >> 8;\n-\t\tea->addr_bytes[3] = o1 & 0xff;\n-\t\tea->addr_bytes[4] = o2 >> 8;\n-\t\tea->addr_bytes[5] = o2 & 0xff;\n-\t} else {\n-\t\t/* unknown format */\n-\t\trte_errno = EINVAL;\n+\tif  (get_ether_addr6(s, ea) || get_ether_addr3(s, ea))\n+\t\treturn 0;\n+\telse {\n+\t\trte_errno = -EINVAL;\n \t\treturn -1;\n \t}\n-\treturn 0;\n }\n",
    "prefixes": [
        "RFC"
    ]
}