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 D81C7A0543 for ; Sat, 5 Nov 2022 18:13:54 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D3E3C42D2F; Sat, 5 Nov 2022 18:13:54 +0100 (CET) Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by mails.dpdk.org (Postfix) with ESMTP id 5259C400D5 for ; Sat, 5 Nov 2022 18:13:53 +0100 (CET) Received: by mail-wr1-f47.google.com with SMTP id j15so10894618wrq.3 for ; Sat, 05 Nov 2022 10:13:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=zyEJQX7yJ33g1V1Zhu/Eik4yF962tWjitSJg0GyEOjE=; b=CzgTXo/yznPxxn3IAdhVhX8yPB9euKdgSgQk/XJaasEYVYsfrbQ39SUtS5d9gNXqCh 2UQwwL5fPlYh4G7OfffJgorma9BlrBBtnlTpnEDpxts/ucAiOKDxo82RK6w9AeXLsb4L fF7I7TUu1eQnTp02Wc7281qAh0CyaY4Z45c/l2MV7VN/64BXxCsEjEjYmNS3aKiRwrY1 yYTNsFNodEZKQ0VgydZC+rX6+jkQbkOro/MpHlUQPTPT6u2NmXVVoHCdU4U7upD7h0s8 sogbZOMV+dVKALWMnw6HWWVe3DjtFVh11KyLPOQpiNif0Two47f1k5nawyKSUJzXdiwQ aslQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=zyEJQX7yJ33g1V1Zhu/Eik4yF962tWjitSJg0GyEOjE=; b=Bsx/98mWBg9EqWglblyG+S7x1xiqzHq1qbpvnWOOOxszzN1kxWmlHDnrP/SD6591oe 1ZYDz7GL4jfdS8Ec+DC9cK/Ur5iY+ibotaHqu1wlmT+BkwUBO8z3JEb3C11AWX9j+Gj0 8HR+4kE9G2wMfsYRY82FL2F3ASta0xuOuPASrFz9zsypeZ1ege1I8XfnBGcBC1D2W4ro YNg+1R/ZTZGcoPzPV7/lwWiRNN+usaCWgcttNxXanLlUvsujeGNPvhHxlaRTVxxvkz2X zQDJiCLKBydjlCILm4oWwGfIgOqdxJ8P5l152e8CTa8SgeMzLuXeBA/weNnSfwGAIpFP GKmA== X-Gm-Message-State: ACrzQf0yn5HSaMj9EjjX+KRp5ebd2t58oacqLM0sp/9ylzXgGbeGrHmF PJ/SKnY2MCsIAd7Ty0GBkTULtNdj24U= X-Google-Smtp-Source: AMsMyM5QrRZO1k4QtMtyUffrmQ344W3FsSsm/reNiNZQ2vT5SUECABpfdkGBgNPlGNUbMIBpUcNFww== X-Received: by 2002:a5d:45d0:0:b0:236:8201:1cb7 with SMTP id b16-20020a5d45d0000000b0023682011cb7mr25830014wrs.417.1667668432985; Sat, 05 Nov 2022 10:13:52 -0700 (PDT) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id z15-20020a5d4c8f000000b00236a16c00ffsm2575780wrs.43.2022.11.05.10.13.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Nov 2022 10:13:52 -0700 (PDT) From: luca.boccassi@gmail.com To: Hernan Vargas Cc: Maxime Coquelin , dpdk stable Subject: patch 'baseband/acc100: check turbo dec/enc input' has been queued to stable release 20.11.7 Date: Sat, 5 Nov 2022 17:11:37 +0000 Message-Id: <20221105171146.1520039-38-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221105171146.1520039-1-luca.boccassi@gmail.com> References: <20221103092758.1099402-100-luca.boccassi@gmail.com> <20221105171146.1520039-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 Hi, FYI, your patch has been queued to stable release 20.11.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/07/22. 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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/78a4ffd8a3b8ee5428f22febcd0c465705b3d267 Thanks. Luca Boccassi --- >From 78a4ffd8a3b8ee5428f22febcd0c465705b3d267 Mon Sep 17 00:00:00 2001 From: Hernan Vargas Date: Thu, 20 Oct 2022 22:20:38 -0700 Subject: [PATCH] baseband/acc100: check turbo dec/enc input [ upstream commit 1d43b46139bb7a2f17ed3a17d4f6708d062253d0 ] Add NULL check for the turbo decoder and encoder input length. Fixes: 3bfc5f60403 ("baseband/acc100: add debug function to validate input") Signed-off-by: Hernan Vargas Reviewed-by: Maxime Coquelin --- drivers/baseband/acc100/rte_acc100_pmd.c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/drivers/baseband/acc100/rte_acc100_pmd.c b/drivers/baseband/acc100/rte_acc100_pmd.c index f9e45a61e7..8c06f0bfc5 100644 --- a/drivers/baseband/acc100/rte_acc100_pmd.c +++ b/drivers/baseband/acc100/rte_acc100_pmd.c @@ -2092,6 +2092,11 @@ validate_enc_op(struct rte_bbdev_enc_op *op) return -1; } + if (unlikely(turbo_enc->input.length == 0)) { + rte_bbdev_log(ERR, "input length null"); + return -1; + } + if (turbo_enc->code_block_mode == 0) { tb = &turbo_enc->tb_params; if ((tb->k_neg < RTE_BBDEV_TURBO_MIN_CB_SIZE @@ -2111,11 +2116,12 @@ validate_enc_op(struct rte_bbdev_enc_op *op) RTE_BBDEV_TURBO_MAX_CB_SIZE); return -1; } - if (tb->c_neg > (RTE_BBDEV_TURBO_MAX_CODE_BLOCKS - 1)) + if (unlikely(tb->c_neg > 0)) { rte_bbdev_log(ERR, - "c_neg (%u) is out of range 0 <= value <= %u", - tb->c_neg, - RTE_BBDEV_TURBO_MAX_CODE_BLOCKS - 1); + "c_neg (%u) expected to be null", + tb->c_neg); + return -1; + } if (tb->c < 1 || tb->c > RTE_BBDEV_TURBO_MAX_CODE_BLOCKS) { rte_bbdev_log(ERR, "c (%u) is out of range 1 <= value <= %u", @@ -2607,6 +2613,11 @@ validate_dec_op(struct rte_bbdev_dec_op *op) return -1; } + if (unlikely(turbo_dec->input.length == 0)) { + rte_bbdev_log(ERR, "input length null"); + return -1; + } + if (turbo_dec->code_block_mode == 0) { tb = &turbo_dec->tb_params; if ((tb->k_neg < RTE_BBDEV_TURBO_MIN_CB_SIZE @@ -2627,11 +2638,13 @@ validate_dec_op(struct rte_bbdev_dec_op *op) RTE_BBDEV_TURBO_MAX_CB_SIZE); return -1; } - if (tb->c_neg > (RTE_BBDEV_TURBO_MAX_CODE_BLOCKS - 1)) + if (unlikely(tb->c_neg > (RTE_BBDEV_TURBO_MAX_CODE_BLOCKS - 1))) { rte_bbdev_log(ERR, "c_neg (%u) is out of range 0 <= value <= %u", tb->c_neg, RTE_BBDEV_TURBO_MAX_CODE_BLOCKS - 1); + return -1; + } if (tb->c < 1 || tb->c > RTE_BBDEV_TURBO_MAX_CODE_BLOCKS) { rte_bbdev_log(ERR, "c (%u) is out of range 1 <= value <= %u", -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-05 17:11:12.040225135 +0000 +++ 0038-baseband-acc100-check-turbo-dec-enc-input.patch 2022-11-05 17:11:08.802945390 +0000 @@ -1 +1 @@ -From 1d43b46139bb7a2f17ed3a17d4f6708d062253d0 Mon Sep 17 00:00:00 2001 +From 78a4ffd8a3b8ee5428f22febcd0c465705b3d267 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 1d43b46139bb7a2f17ed3a17d4f6708d062253d0 ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -14 +15 @@ - drivers/baseband/acc/rte_acc100_pmd.c | 23 ++++++++++++++++++----- + drivers/baseband/acc100/rte_acc100_pmd.c | 23 ++++++++++++++++++----- @@ -17,5 +18,5 @@ -diff --git a/drivers/baseband/acc/rte_acc100_pmd.c b/drivers/baseband/acc/rte_acc100_pmd.c -index 577c107e9a..eba70654e8 100644 ---- a/drivers/baseband/acc/rte_acc100_pmd.c -+++ b/drivers/baseband/acc/rte_acc100_pmd.c -@@ -1764,6 +1764,11 @@ validate_enc_op(struct rte_bbdev_enc_op *op, struct acc_queue *q) +diff --git a/drivers/baseband/acc100/rte_acc100_pmd.c b/drivers/baseband/acc100/rte_acc100_pmd.c +index f9e45a61e7..8c06f0bfc5 100644 +--- a/drivers/baseband/acc100/rte_acc100_pmd.c ++++ b/drivers/baseband/acc100/rte_acc100_pmd.c +@@ -2092,6 +2092,11 @@ validate_enc_op(struct rte_bbdev_enc_op *op) @@ -30 +31 @@ - if (turbo_enc->code_block_mode == RTE_BBDEV_TRANSPORT_BLOCK) { + if (turbo_enc->code_block_mode == 0) { @@ -33 +34 @@ -@@ -1783,11 +1788,12 @@ validate_enc_op(struct rte_bbdev_enc_op *op, struct acc_queue *q) +@@ -2111,11 +2116,12 @@ validate_enc_op(struct rte_bbdev_enc_op *op) @@ -50 +51 @@ -@@ -2281,6 +2287,11 @@ validate_dec_op(struct rte_bbdev_dec_op *op, struct acc_queue *q) +@@ -2607,6 +2613,11 @@ validate_dec_op(struct rte_bbdev_dec_op *op) @@ -59 +60 @@ - if (turbo_dec->code_block_mode == RTE_BBDEV_TRANSPORT_BLOCK) { + if (turbo_dec->code_block_mode == 0) { @@ -62 +63 @@ -@@ -2301,11 +2312,13 @@ validate_dec_op(struct rte_bbdev_dec_op *op, struct acc_queue *q) +@@ -2627,11 +2638,13 @@ validate_dec_op(struct rte_bbdev_dec_op *op)