From patchwork Thu Jul 18 18:35:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 56737 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id CC10BDE3; Thu, 18 Jul 2019 20:35:50 +0200 (CEST) Received: from mail-pg1-f195.google.com (mail-pg1-f195.google.com [209.85.215.195]) by dpdk.org (Postfix) with ESMTP id 9FEB81C01 for ; Thu, 18 Jul 2019 20:35:49 +0200 (CEST) Received: by mail-pg1-f195.google.com with SMTP id x15so2930990pgg.8 for ; Thu, 18 Jul 2019 11:35:49 -0700 (PDT) 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:in-reply-to:references; bh=S72pm0CX4kykXapOM1in77vgZS1COJ4IuaXXiypAMso=; b=yQpIIS7OtKJ/3rZAnYuKtlRN7LwV2g/Kj0dwobNnL4bHsMBid0HttHnIxxnQ/U2lcz NSrdkimAN85pbXl2HN9ECtmRpT1I5xxMjGYQBkKPrCaJ8r1/0eBeEXeKQnA7KAm/soqy QVy0RFttyJqWaS/DbDMbP8vFX4c4zJAOj5QwpC6ugHkRo33FWwIi4fktvRDlmwNNu9zf pbHEwZZGT3guQ++3T0d/qU/S6aQAtYsZw2Kws3aO+6zDpyvPntCpSgBxKLYy6InSxkpp RpUg5/qWT46uH1MxIIy0byy0kKc/30d/Ke8b2hISVtyPC/VrAYLKk+mdCiIYGEJKu2Vp KikA== 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:in-reply-to :references; bh=S72pm0CX4kykXapOM1in77vgZS1COJ4IuaXXiypAMso=; b=SRCQJP/YeG9SBO8R4ex+WzR5z7xaVjXey6WkSjTh0bDgItHhgQc+CN5R1oxLcfD6wq 2aNXKC2ERM3qmUDCV8pNTG5PsNN+Dy904+9CQjEk+aPbU1wDSn/T3VfcVDXbN1k6BhX3 4OAS47ejEiRVMMxSg/C3QJYYVVLEjqjNRoNvUNKojsLAaRwCS4rjpVSC67Iee8LVb4qE 5kO2OyuriGm0HMQq8muL9tYWI+eA41yca8yimEULiPIcLDm7c8gX5ekesQ87eCNcK5Rd dMl+d7zo0UGdiSgkRaY+2PpGPzg4N7FfmT+ixN3fpYMUn9KXDImPZkeB0lwEQeSx5+Z+ cbAw== X-Gm-Message-State: APjAAAVlJ+3/knjw+mAaTcMTswtPKUN1UnTKXJAptVBmhgZCFZKbyb3U 258Pj5if6aQZbnClNFecJzCGCGpl X-Google-Smtp-Source: APXvYqxgES9Dczm5xuHJarGBKObSfI/yubKrDOKlO6XB4j9GNF+HeHbpM4mqy3q2NxwRF3t4cEyT6w== X-Received: by 2002:a65:6904:: with SMTP id s4mr44672880pgq.33.1563474948322; Thu, 18 Jul 2019 11:35:48 -0700 (PDT) Received: from localhost.localdomain ([67.23.203.6]) by smtp.gmail.com with ESMTPSA id 196sm30963784pfy.167.2019.07.18.11.35.47 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 18 Jul 2019 11:35:47 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Thu, 18 Jul 2019 11:35:44 -0700 Message-Id: <20190718183544.22988-1-stephen@networkplumber.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190717184945.4025-1-stephen@networkplumber.org> References: <20190717184945.4025-1-stephen@networkplumber.org> Subject: [dpdk-dev] [PATCH v2] net: be more restrictive in accepted ether string formats X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" The current ether_unformat_addr code was based off of BSD ether_aton. That version changed what was allowed by the cmdline ether address parser. For example, it allows dropping leading zeros. Change the code to be more restrictive and only allow the fully expanded standard formats. Bugzilla ID: 324 Fixes: 596d31092d32 ("net: add function to convert string to ethernet address") Signed-off-by: Stephen Hemminger Reviewed-by: Olivier Matz --- v2 - incorporate RFC review feedback ` lib/librte_net/rte_ether.c | 113 ++++++++++++++++++++++++------------- lib/librte_net/rte_ether.h | 3 + 2 files changed, 78 insertions(+), 38 deletions(-) diff --git a/lib/librte_net/rte_ether.c b/lib/librte_net/rte_ether.c index 8d040173cfc6..ced65ed9f3cb 100644 --- a/lib/librte_net/rte_ether.c +++ b/lib/librte_net/rte_ether.c @@ -2,6 +2,8 @@ * Copyright(c) 2010-2014 Intel Corporation */ +#include + #include #include @@ -29,50 +31,85 @@ rte_ether_format_addr(char *buf, uint16_t size, eth_addr->addr_bytes[5]); } +static int8_t get_xdigit(char ch) +{ + if (ch >= '0' && ch <= '9') + return ch - '0'; + if (ch >= 'a' && ch <= 'f') + return ch - 'a' + 10; + if (ch >= 'A' && ch <= 'F') + return ch - 'A' + 10; + return -1; +} + +/* Convert 00:11:22:33:44:55 to ethernet address */ +static bool get_ether_addr6(const char *s0, struct rte_ether_addr *ea) +{ + const char *s = s0; + int i; + + for (i = 0; i < RTE_ETHER_ADDR_LEN; i++) { + int8_t x; + + x = get_xdigit(*s++); + if (x < 0) + return false; + + ea->addr_bytes[i] = x << 4; + x = get_xdigit(*s++); + if (x < 0) + return false; + ea->addr_bytes[i] |= x; + + if (i < RTE_ETHER_ADDR_LEN - 1 && + *s++ != ':') + return false; + } + + /* return true if at end of string */ + return *s == '\0'; +} + +/* Convert 0011:2233:4455 to ethernet address */ +static bool get_ether_addr3(const char *s, struct rte_ether_addr *ea) +{ + int i, j; + + for (i = 0; i < RTE_ETHER_ADDR_LEN; i += 2) { + uint16_t w = 0; + + for (j = 0; j < 4; j++) { + int8_t x; + + x = get_xdigit(*s++); + if (x < 0) + return false; + w = (w << 4) | x; + } + ea->addr_bytes[i] = w >> 8; + ea->addr_bytes[i + 1] = w & 0xff; + + if (i < RTE_ETHER_ADDR_LEN - 2 && + *s++ != ':') + return false; + } + + return *s == '\0'; +} + /* * Like ether_aton_r but can handle either * XX:XX:XX:XX:XX:XX or XXXX:XXXX:XXXX + * and is more restrictive. */ int rte_ether_unformat_addr(const char *s, struct rte_ether_addr *ea) { - unsigned int o0, o1, o2, o3, o4, o5; - int n; - - n = sscanf(s, "%x:%x:%x:%x:%x:%x", - &o0, &o1, &o2, &o3, &o4, &o5); - - if (n == 6) { - /* Standard format XX:XX:XX:XX:XX:XX */ - if (o0 > UINT8_MAX || o1 > UINT8_MAX || o2 > UINT8_MAX || - o3 > UINT8_MAX || o4 > UINT8_MAX || o5 > UINT8_MAX) { - rte_errno = ERANGE; - return -1; - } + if (get_ether_addr6(s, ea)) + return 0; + if (get_ether_addr3(s, ea)) + return 0; - ea->addr_bytes[0] = o0; - ea->addr_bytes[1] = o1; - ea->addr_bytes[2] = o2; - ea->addr_bytes[3] = o3; - ea->addr_bytes[4] = o4; - ea->addr_bytes[5] = o5; - } else if (n == 3) { - /* Support the format XXXX:XXXX:XXXX */ - if (o0 > UINT16_MAX || o1 > UINT16_MAX || o2 > UINT16_MAX) { - rte_errno = ERANGE; - return -1; - } - - ea->addr_bytes[0] = o0 >> 8; - ea->addr_bytes[1] = o0 & 0xff; - ea->addr_bytes[2] = o1 >> 8; - ea->addr_bytes[3] = o1 & 0xff; - ea->addr_bytes[4] = o2 >> 8; - ea->addr_bytes[5] = o2 & 0xff; - } else { - /* unknown format */ - rte_errno = EINVAL; - return -1; - } - return 0; + rte_errno = EINVAL; + return -1; } diff --git a/lib/librte_net/rte_ether.h b/lib/librte_net/rte_ether.h index 8ac1afecc826..c2f15c56c784 100644 --- a/lib/librte_net/rte_ether.h +++ b/lib/librte_net/rte_ether.h @@ -252,6 +252,9 @@ rte_ether_format_addr(char *buf, uint16_t size, * * @param str * A pointer to buffer contains the formatted MAC address. + * The supported formats are: + * XX:XX:XX:XX:XX:XX or XXXX:XXXX:XXXX + * where XX is a hex digit: 0-9, a-f, or A-F. * @param eth_addr * A pointer to a ether_addr structure. * @return