From patchwork Wed May 2 14:42:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?N=C3=A9lio_Laranjeiro?= X-Patchwork-Id: 39239 X-Patchwork-Delegate: shahafs@mellanox.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 2B02720BD; Wed, 2 May 2018 16:42:01 +0200 (CEST) Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by dpdk.org (Postfix) with ESMTP id 2DB8B126B for ; Wed, 2 May 2018 16:42:00 +0200 (CEST) Received: by mail-wm0-f65.google.com with SMTP id n10so24780892wmc.1 for ; Wed, 02 May 2018 07:42:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=Qw+5eUoqUQIurURCH4dHmM5Lspg1H2UEjFYCBIUTs4Y=; b=zQpudjJBueZnNBVM07FL1mYXrvXqHUYhxMWYY724aKVKNsNfs7yg/KVfke2jUv2PCs PzwUXRVsEiitF7kZRO66nI65OcL5yvxg/n9Kl+tt4LlzxNmR1BZgybv6o02QSRhHQP9D OEs4gnXGDvVcvWHhyDBWgrE5A6dO9nIhJzEy1F6LkR+lj1mAdNfYFabIEipZgFQFd2oR kMLzVlnx0ZHdJD6QeXuD22q+Eqa+G8c99B1+fGRBesg/n4lzP3jYYf7emr1ybTU1EFyh mAmJIj0S8N9VqBQ+4otVo3jwR+vZ4WQiOm5e2gmmoN8M4rWbDsQqyN2vj4SdJOFtsiui WUYA== 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; bh=Qw+5eUoqUQIurURCH4dHmM5Lspg1H2UEjFYCBIUTs4Y=; b=coOr3+aLhTgZnnm/XKzYsFUPM1321WOTMOcLB7QAJ7xl/F5TRWXg9n12SPl72tmS8t qZtKkei1GWASQozZFKJlW4kV0Q2actcukLHQve4fldna8KEL2rzOnlA6bpQSdT4aYEpW 23eK1c8JDos7jl2ymoL3YgqhmTsRU+CfPYPfm5XKwVQwjOw0mb9AsgSydeUieVD3/Vea DThO4VGaiQnYBeXDv2esD1p/+4wqEkFJf8EhB8aPnpDLXpgdCWioEt8MOBwYjHPTmwtg NOIeZMl2BPmpCmpWU1AyFOWdeCyhacWr0PwWOStTVKPwEnwxx34xWhTf+NUO2jCPa3DX swRQ== X-Gm-Message-State: ALQs6tBzdiZMVz+UPhyyhhBoE2+ls3hsgYFj9mafHaXVBhe9yTRVP3Yt rDmPKurgq+0xaPG1VnJzZwfaO9aOrQ== X-Google-Smtp-Source: AB8JxZpsHbwZf+N0ZX/aM42zzZKq22TevwCduRYgi2iPpTkiDGSKPViKGDzrdz5CktMjAs08MSEh2g== X-Received: by 10.28.161.4 with SMTP id k4mr12131753wme.106.1525272119652; Wed, 02 May 2018 07:41:59 -0700 (PDT) Received: from laranjeiro-vm.dev.6wind.com (host.78.145.23.62.rev.coltfrance.com. [62.23.145.78]) by smtp.gmail.com with ESMTPSA id r3sm12686739wmg.5.2018.05.02.07.41.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 02 May 2018 07:41:59 -0700 (PDT) From: Nelio Laranjeiro To: dev@dpdk.org, Adrien Mazarguil , Yongseok Koh Cc: stable@dpdk.org Date: Wed, 2 May 2018 16:42:57 +0200 Message-Id: X-Mailer: git-send-email 2.17.0 Subject: [dpdk-dev] [PATCH] net/mlx5: fix: flow validation 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" Item spec and last are wrongly compared to the NIC capability causing a validation failure when the mask is null. This validation function should only verify the user is not configuring unsupported matching fields. Fixes: 2097d0d1e2cc ("net/mlx5: support basic flow items and actions") Cc: stable@dpdk.org Signed-off-by: Nelio Laranjeiro --- drivers/net/mlx5/mlx5_flow.c | 73 +++++++++++------------------------- 1 file changed, 22 insertions(+), 51 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index 129311d50..5d4995783 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -555,60 +555,31 @@ static int mlx5_flow_item_validate(const struct rte_flow_item *item, const uint8_t *mask, unsigned int size) { - if (!item->spec && (item->mask || item->last)) { - rte_errno = EINVAL; - return -rte_errno; - } - if (item->spec && !item->mask) { - unsigned int i; - const uint8_t *spec = item->spec; - - for (i = 0; i < size; ++i) - if ((spec[i] | mask[i]) != mask[i]) { - rte_errno = EINVAL; - return -rte_errno; - } - } - if (item->last && !item->mask) { - unsigned int i; - const uint8_t *spec = item->last; - - for (i = 0; i < size; ++i) - if ((spec[i] | mask[i]) != mask[i]) { - rte_errno = EINVAL; - return -rte_errno; - } - } - if (item->mask) { - unsigned int i; - const uint8_t *spec = item->spec; - - for (i = 0; i < size; ++i) - if ((spec[i] | mask[i]) != mask[i]) { - rte_errno = EINVAL; - return -rte_errno; - } - } - if (item->spec && item->last) { - uint8_t spec[size]; - uint8_t last[size]; - const uint8_t *apply = mask; - unsigned int i; - int ret; + unsigned int i; + const uint8_t *spec = item->spec; + const uint8_t *last = item->last; + const uint8_t *m = item->mask ? item->mask : mask; - if (item->mask) - apply = item->mask; - for (i = 0; i < size; ++i) { - spec[i] = ((const uint8_t *)item->spec)[i] & apply[i]; - last[i] = ((const uint8_t *)item->last)[i] & apply[i]; - } - ret = memcmp(spec, last, size); - if (ret != 0) { - rte_errno = EINVAL; - return -rte_errno; - } + if (!spec && (item->mask || last)) + goto error; + if (!spec) + return 0; + for (i = 0; i < size; i++) { + if (spec) + if (((spec[i] & m[i]) | mask[i]) != mask[i]) + goto error; + if (last) + if ((((last[i] & m[i]) | mask[i]) != mask[i]) || + ((spec[i] & m[i]) != (last[i] & m[i]))) + goto error; + if (m) + if ((m[i] | mask[i]) != mask[i]) + goto error; } return 0; +error: + rte_errno = ENOTSUP; + return -rte_errno; } /**