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 7AF16A0542 for ; Fri, 11 Nov 2022 11:35:05 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 75FB640150; Fri, 11 Nov 2022 11:35:05 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 56D874014F for ; Fri, 11 Nov 2022 11:35:03 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1668162902; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UW/8yOzdKrYwOLYP8oGuHb716rcSxrLw4X1QqUCRBG8=; b=eKD46E13pt8K6E1boO5UDGOOVdnYdBIzYCsv3agKrQUB5b86CmYvPXNvJ3jxrvqfBKMAad CHDFsOzaxjjQvGyDcH+hO8sUFFfyiPNgEsD7rabYh/cA5t6Qkb3doZ87FHjQ4WZbIukply Ac6ruNfPsYbzudA5ucVjN6LldXOGvgk= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-600-5eCNc37LOaOnmDhZOr2dww-1; Fri, 11 Nov 2022 05:35:01 -0500 X-MC-Unique: 5eCNc37LOaOnmDhZOr2dww-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3E9D7101A52A; Fri, 11 Nov 2022 10:35:01 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.195.104]) by smtp.corp.redhat.com (Postfix) with ESMTP id EC1EE2022EA2; Fri, 11 Nov 2022 10:34:59 +0000 (UTC) From: Kevin Traynor To: Hernan Vargas Cc: Maxime Coquelin , dpdk stable Subject: patch 'baseband/acc100: check turbo dec/enc input' has been queued to stable release 21.11.3 Date: Fri, 11 Nov 2022 10:33:28 +0000 Message-Id: <20221111103337.307408-38-ktraynor@redhat.com> In-Reply-To: <20221111103337.307408-1-ktraynor@redhat.com> References: <20221111103337.307408-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 21.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 11/14/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/257dd80bd62dfe45348b8f81c4e5181e99d74318 Thanks. Kevin --- >From 257dd80bd62dfe45348b8f81c4e5181e99d74318 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 9add3056ab..82d23af1a1 100644 --- a/drivers/baseband/acc100/rte_acc100_pmd.c +++ b/drivers/baseband/acc100/rte_acc100_pmd.c @@ -2087,4 +2087,9 @@ validate_enc_op(struct rte_bbdev_enc_op *op) } + if (unlikely(turbo_enc->input.length == 0)) { + rte_bbdev_log(ERR, "input length null"); + return -1; + } + if (turbo_enc->code_block_mode == RTE_BBDEV_TRANSPORT_BLOCK) { tb = &turbo_enc->tb_params; @@ -2106,9 +2111,10 @@ validate_enc_op(struct rte_bbdev_enc_op *op) 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, @@ -2602,4 +2608,9 @@ validate_dec_op(struct rte_bbdev_dec_op *op) } + if (unlikely(turbo_dec->input.length == 0)) { + rte_bbdev_log(ERR, "input length null"); + return -1; + } + if (turbo_dec->code_block_mode == RTE_BBDEV_TRANSPORT_BLOCK) { tb = &turbo_dec->tb_params; @@ -2622,9 +2633,11 @@ validate_dec_op(struct rte_bbdev_dec_op *op) 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, -- 2.38.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-11 10:32:17.970605128 +0000 +++ 0038-baseband-acc100-check-turbo-dec-enc-input.patch 2022-11-11 10:32:17.110300913 +0000 @@ -1 +1 @@ -From 1d43b46139bb7a2f17ed3a17d4f6708d062253d0 Mon Sep 17 00:00:00 2001 +From 257dd80bd62dfe45348b8f81c4e5181e99d74318 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 -@@ -1765,4 +1765,9 @@ 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 9add3056ab..82d23af1a1 100644 +--- a/drivers/baseband/acc100/rte_acc100_pmd.c ++++ b/drivers/baseband/acc100/rte_acc100_pmd.c +@@ -2087,4 +2087,9 @@ validate_enc_op(struct rte_bbdev_enc_op *op) @@ -31 +32 @@ -@@ -1784,9 +1789,10 @@ validate_enc_op(struct rte_bbdev_enc_op *op, struct acc_queue *q) +@@ -2106,9 +2111,10 @@ validate_enc_op(struct rte_bbdev_enc_op *op) @@ -46 +47 @@ -@@ -2282,4 +2288,9 @@ validate_dec_op(struct rte_bbdev_dec_op *op, struct acc_queue *q) +@@ -2602,4 +2608,9 @@ validate_dec_op(struct rte_bbdev_dec_op *op) @@ -56 +57 @@ -@@ -2302,9 +2313,11 @@ validate_dec_op(struct rte_bbdev_dec_op *op, struct acc_queue *q) +@@ -2622,9 +2633,11 @@ validate_dec_op(struct rte_bbdev_dec_op *op)