From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by dpdk.org (Postfix) with ESMTP id 038D39B43 for ; Thu, 25 May 2017 11:52:42 +0200 (CEST) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 25 May 2017 02:52:42 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.38,391,1491289200"; d="scan'208";a="91624846" Received: from yliu-dev.sh.intel.com ([10.239.67.162]) by orsmga002.jf.intel.com with ESMTP; 25 May 2017 02:52:42 -0700 From: Yuanhan Liu To: Adrien Mazarguil Cc: Yuanhan Liu , dpdk stable Date: Thu, 25 May 2017 17:50:03 +0800 Message-Id: <1495705809-21416-151-git-send-email-yuanhan.liu@linux.intel.com> X-Mailer: git-send-email 1.9.0 In-Reply-To: <1495705809-21416-1-git-send-email-yuanhan.liu@linux.intel.com> References: <1495705809-21416-1-git-send-email-yuanhan.liu@linux.intel.com> Subject: [dpdk-stable] patch 'app/testpmd: fix MAC endian in flow command' has been queued to stable release 17.02.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 May 2017 09:52:43 -0000 Hi, FYI, your patch has been queued to stable release 17.02.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/28/17. So please shout if anyone has objections. Thanks. --yliu --- >>From 612462830cb65182a3f0aba9e42c00812669467b Mon Sep 17 00:00:00 2001 From: Adrien Mazarguil Date: Thu, 4 May 2017 19:08:23 +0200 Subject: [PATCH] app/testpmd: fix MAC endian in flow command [ upstream commit 09a670e8716f57ad8fd26761bf8e8d8ff22b85c5 ] MAC addresses are implicitly handled in network order since they are actually byte strings, however this is not properly enforced with MAC masks provided as prefix lengths, which end up inverted on little endian systems. Fixes: 6df81b325fa4 ("app/testpmd: add items eth/vlan to flow command") Signed-off-by: Adrien Mazarguil --- app/test-pmd/cmdline_flow.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c index 12712fd..9414dac 100644 --- a/app/test-pmd/cmdline_flow.c +++ b/app/test-pmd/cmdline_flow.c @@ -1021,13 +1021,13 @@ static const struct token token_list[] = { .name = "dst", .help = "destination MAC", .next = NEXT(item_eth, NEXT_ENTRY(MAC_ADDR), item_param), - .args = ARGS(ARGS_ENTRY(struct rte_flow_item_eth, dst)), + .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_eth, dst)), }, [ITEM_ETH_SRC] = { .name = "src", .help = "source MAC", .next = NEXT(item_eth, NEXT_ENTRY(MAC_ADDR), item_param), - .args = ARGS(ARGS_ENTRY(struct rte_flow_item_eth, src)), + .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_eth, src)), }, [ITEM_ETH_TYPE] = { .name = "type", @@ -2145,6 +2145,9 @@ parse_mac_addr(struct context *ctx, const struct token *token, /* Bit-mask fill is not supported. */ if (arg->mask || size != sizeof(tmp)) goto error; + /* Only network endian is supported. */ + if (!arg->hton) + goto error; ret = cmdline_parse_etheraddr(NULL, str, &tmp, size); if (ret < 0 || (unsigned int)ret != len) goto error; -- 1.9.0