From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 8BBA1A0C47 for ; Mon, 26 Jul 2021 15:54:53 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 81B8840DDA; Mon, 26 Jul 2021 15:54:53 +0200 (CEST) Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by mails.dpdk.org (Postfix) with ESMTP id 73CAD40DDA for ; Mon, 26 Jul 2021 15:54:51 +0200 (CEST) Received: by mail-wr1-f44.google.com with SMTP id r2so11241951wrl.1 for ; Mon, 26 Jul 2021 06:54:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=JcsocWYKIIXWYgOUBwsKJFdE0DK+ZnaGgtwpYkR9sbY=; b=SUggYoUbHV7e9oAeAm1CJZSn339VwePyyyRTGvftfmZmhPMS591YXw/kUsqa2OAkWM O9olWMrfn6LkYKG/B7im0ZlxvnpsGFmyK2O6EAPC3HynYXM85IEgk96GDIIw5cHmvBgk VZYjFbWpvfJAbGDcpOdaldHpvI4kV5o+o8rMif+v3argvVn9BFMVEqmTThEhhUiFtgT0 VMqIj9k1FhSDinPiocMwa3dGbaHng2RbLlSgaQVbsCN4l8Cyty4KRiggKADeer65yrtt hcPRAQZMH2PKn03Yqaw5Bc68B4oJV9f0oX0j5pjJyFkBuo4wjucwKxQyIIaoeV8I2j8H kpOw== 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:mime-version:content-transfer-encoding; bh=JcsocWYKIIXWYgOUBwsKJFdE0DK+ZnaGgtwpYkR9sbY=; b=UYfNRY0jrMjHa0Xjfo7ABVdHxCEF8uAJRaYoliFq3TGrbhXoQx0/YyO1Kql+Wn4/58 8IsDQ8PeQaW7DxX1RzKNKWqhBU/ACgnkC5eTbUm3e7MHY32VvszbSvGQq/E53XNrJ7kU cW5e0BSaYbxPrQfppxgVipD4qe7rqBsShU4nYn+WC0g12IGyEguC2UKq/4NxcHwJbDrF 0NnBmYNqRhQH2AyFpJ54t3vWpecSJ4OhqFxqIrtFS1haliiiVCxKSLhDzRIPxMEKKCOP ERakaJ8UXD063pvp5zX3sQWbBF85vADNgf3IDjzPX0oWEX1+zesIXDsOn3gHKzyoeV+u jqGQ== X-Gm-Message-State: AOAM531X2HsQ/nOyPU3l03dkKFBfPsB4fu5f+ygxzEMnUy5TstugeKa1 v3BiUp3jyYTGKDpWmE/SQas= X-Google-Smtp-Source: ABdhPJzZaMJegaYCUsNWR+y5LAW4VO2wpoyRuBrwDFi+QvLsWT1p8bScWKOm1HnhGHCCgBuzdfxKWg== X-Received: by 2002:adf:f550:: with SMTP id j16mr14152463wrp.91.1627307691287; Mon, 26 Jul 2021 06:54:51 -0700 (PDT) Received: from localhost ([137.220.125.106]) by smtp.gmail.com with ESMTPSA id j14sm6643718wru.58.2021.07.26.06.54.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jul 2021 06:54:50 -0700 (PDT) From: luca.boccassi@gmail.com To: Michael Baum Cc: Matan Azrad , dpdk stable Date: Mon, 26 Jul 2021 14:52:49 +0100 Message-Id: <20210726135322.149850-26-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210726135322.149850-1-luca.boccassi@gmail.com> References: <20210712130551.2462159-1-luca.boccassi@gmail.com> <20210726135322.149850-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'regex/mlx5: fix size of setup constants' has been queued to stable release 20.11.3 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/28/21. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/4eb4301b074502667a0b8f425347d0219b366cab Thanks. Luca Boccassi --- >From 4eb4301b074502667a0b8f425347d0219b366cab Mon Sep 17 00:00:00 2001 From: Michael Baum Date: Thu, 1 Jul 2021 09:39:13 +0300 Subject: [PATCH] regex/mlx5: fix size of setup constants [ upstream commit 423719a3677cc18d742264315c8451a931ade8e5 ] The constant representing the size of the metadata is defined as an unsigned int variable with 32-bit. Similarly the constant representing the maximal output is also defined as an unsigned int variable with 32-bit. There is potentially overflowing expression when those constants are evaluated using 32-bit arithmetic, and then used in a context that expects an expression of type size_t that might be 64-bit. Change the size of the above constants to size_t. Fixes: 30d604bb1504 ("regex/mlx5: fix type of setup constants") Signed-off-by: Michael Baum Acked-by: Matan Azrad --- drivers/regex/mlx5/mlx5_regex_fastpath.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/regex/mlx5/mlx5_regex_fastpath.c b/drivers/regex/mlx5/mlx5_regex_fastpath.c index 8d134ac98e..2d28e85e4d 100644 --- a/drivers/regex/mlx5/mlx5_regex_fastpath.c +++ b/drivers/regex/mlx5/mlx5_regex_fastpath.c @@ -25,8 +25,8 @@ #include "mlx5_regex.h" #define MLX5_REGEX_MAX_WQE_INDEX 0xffff -#define MLX5_REGEX_METADATA_SIZE UINT32_C(64) -#define MLX5_REGEX_MAX_OUTPUT RTE_BIT32(11) +#define MLX5_REGEX_METADATA_SIZE ((size_t)64) +#define MLX5_REGEX_MAX_OUTPUT (((size_t)1) << 11) #define MLX5_REGEX_WQE_CTRL_OFFSET 12 #define MLX5_REGEX_WQE_METADATA_OFFSET 16 #define MLX5_REGEX_WQE_GATHER_OFFSET 32 -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-07-26 13:53:17.187248791 +0100 +++ 0026-regex-mlx5-fix-size-of-setup-constants.patch 2021-07-26 13:53:15.853292706 +0100 @@ -1 +1 @@ -From 423719a3677cc18d742264315c8451a931ade8e5 Mon Sep 17 00:00:00 2001 +From 4eb4301b074502667a0b8f425347d0219b366cab Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 423719a3677cc18d742264315c8451a931ade8e5 ] + @@ -18 +19,0 @@ -Cc: stable@dpdk.org @@ -27 +28 @@ -index b57e7d7794..910bc845f3 100644 +index 8d134ac98e..2d28e85e4d 100644