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 7AC62A0350 for ; Mon, 28 Feb 2022 22:21:41 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7620D411AE; Mon, 28 Feb 2022 22:21:41 +0100 (CET) Received: from mail-ed1-f46.google.com (mail-ed1-f46.google.com [209.85.208.46]) by mails.dpdk.org (Postfix) with ESMTP id 2E6D240140 for ; Mon, 28 Feb 2022 22:21:40 +0100 (CET) Received: by mail-ed1-f46.google.com with SMTP id g20so19421090edw.6 for ; Mon, 28 Feb 2022 13:21:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=AyX5hl7PAszp9jVZ1EbtU0PWEYmbz7E+bqlvhuWb/Qs=; b=NF9zeCX7+UB/AT6ODEFYiWcsfdDcq3WEDDMyTAc7qFI0FM+i+LmUslfg8UplFmbkBF 8f1Qnxpv5fzJGYR4prTxqxhaKivzRm7CGjymAGhXws00fxryEo0cTn6DpqhCrzbbmU1e jun8mtqh+YjY3fraafqSFnOG9k23+jmLxNn8lkomTwtIBedXk8l0zoLpmKM7NU+T4abs oUI6xgSUlbTyDcVpcjG/AbFPQEDyQMXcC2wkVpHo+LxHzIDFJ83NyiYsP81Noqd3oa5E 6t36bplC3uluU3hEwOI9/7XxDz3Wv8xF2LrOmtQMvG9xjc7/lEmOfLSSbd9MceCjJUmy exvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=AyX5hl7PAszp9jVZ1EbtU0PWEYmbz7E+bqlvhuWb/Qs=; b=skFPZ25QeSfACAdePofSrNXgkkenJIuq8GaKWnvb9tK7JpcZJjwczp2WXr5wmZ2eEn NlpyPaQz4+yW+m9oQ6znK8xExuUIhzMJZbkIgqzN7zGSt+BCb4D7J3CoB2D5ZUApTTrv uySdHHUx1GZkSjknlj8/iaQuJpoKbDHj084cwWWg++lBdYaMxji0jgRUhtGySqkHC6Uq +pdJjx3KYBvgKjVttKHJF1P26seFyx/RVjJBUZHcmYXolI5osD4xNjLpJPUVd19iweuE 5HsfdrVVK+FTtglDMQ7RsZw7eo/szYPZ9pUqnOgrZZ7W0bf8KiJXDCWTfGb40Wjscef9 o4/Q== X-Gm-Message-State: AOAM530isbkGzKWEoTLzH0t+yR2UQp6aqvbZnBhBsSMSNGKDjMgsOgj8 Ym3n3aN9H1KdsK6eII3Izzbw3A74HCsKTw== X-Google-Smtp-Source: ABdhPJyR7dvu+MtKd9veWpEXc7jFxVdkbGKJc9BeRzclrbMtqQ/40gfnMf0UssFLvqmfEXwf1TEE6w== X-Received: by 2002:a05:6402:2694:b0:411:f0b1:7f90 with SMTP id w20-20020a056402269400b00411f0b17f90mr21825774edd.398.1646083299874; Mon, 28 Feb 2022 13:21:39 -0800 (PST) Received: from localhost ([137.220.125.106]) by smtp.gmail.com with ESMTPSA id gg38-20020a17090689a600b006ba4896f2d7sm4710848ejc.140.2022.02.28.13.21.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Feb 2022 13:21:39 -0800 (PST) From: luca.boccassi@gmail.com To: Nicolas Chautru Cc: dpdk stable Subject: patch 'baseband/acc100: avoid out-of-bounds access' has been queued to stable release 20.11.5 Date: Mon, 28 Feb 2022 21:20:13 +0000 Message-Id: <20220228212047.3341966-17-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220228212047.3341966-1-luca.boccassi@gmail.com> References: <20220218123931.1749595-122-luca.boccassi@gmail.com> <20220228212047.3341966-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.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/02/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/dceebf9eebb3e47717d5cc33e478e4c65ffcafeb Thanks. Luca Boccassi --- >From dceebf9eebb3e47717d5cc33e478e4c65ffcafeb Mon Sep 17 00:00:00 2001 From: Nicolas Chautru Date: Tue, 22 Feb 2022 15:43:36 -0800 Subject: [PATCH] baseband/acc100: avoid out-of-bounds access [ upstream commit fb6996eec066dc7fa0eda951e492a65c8380d930 ] The actual maximum number of gather pointers should have been limited Coverity issue: 375803, 375813, 375819, 375827, 375831 Fixes: 5ad5060f8f7a ("baseband/acc100: add LDPC processing functions") Signed-off-by: Nicolas Chautru --- drivers/baseband/acc100/rte_acc100_pmd.c | 3 +-- drivers/baseband/acc100/rte_acc100_pmd.h | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/baseband/acc100/rte_acc100_pmd.c b/drivers/baseband/acc100/rte_acc100_pmd.c index 05fd467768..c13eb454f9 100644 --- a/drivers/baseband/acc100/rte_acc100_pmd.c +++ b/drivers/baseband/acc100/rte_acc100_pmd.c @@ -1458,8 +1458,7 @@ acc100_dma_fill_blk_type_in(struct acc100_dma_req_desc *desc, next_triplet++; while (cb_len > 0) { - if (next_triplet < ACC100_DMA_MAX_NUM_POINTERS && - m->next != NULL) { + if (next_triplet < ACC100_DMA_MAX_NUM_POINTERS_IN && m->next != NULL) { m = m->next; *seg_total_left = rte_pktmbuf_data_len(m); diff --git a/drivers/baseband/acc100/rte_acc100_pmd.h b/drivers/baseband/acc100/rte_acc100_pmd.h index 03ed0b3e1a..cbcece2966 100644 --- a/drivers/baseband/acc100/rte_acc100_pmd.h +++ b/drivers/baseband/acc100/rte_acc100_pmd.h @@ -113,6 +113,7 @@ #define ACC100_SW_RING_MEM_ALLOC_ATTEMPTS 5 #define ACC100_MAX_QUEUE_DEPTH 1024 #define ACC100_DMA_MAX_NUM_POINTERS 14 +#define ACC100_DMA_MAX_NUM_POINTERS_IN 7 #define ACC100_DMA_DESC_PADDING 8 #define ACC100_FCW_PADDING 12 #define ACC100_DESC_FCW_OFFSET 192 -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-28 21:17:55.370660707 +0000 +++ 0017-baseband-acc100-avoid-out-of-bounds-access.patch 2022-02-28 21:17:53.852929494 +0000 @@ -1 +1 @@ -From fb6996eec066dc7fa0eda951e492a65c8380d930 Mon Sep 17 00:00:00 2001 +From dceebf9eebb3e47717d5cc33e478e4c65ffcafeb Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit fb6996eec066dc7fa0eda951e492a65c8380d930 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index f86474f7e0..de7e4bcef4 100644 +index 05fd467768..c13eb454f9 100644 @@ -22 +23 @@ -@@ -1460,8 +1460,7 @@ acc100_dma_fill_blk_type_in(struct acc100_dma_req_desc *desc, +@@ -1458,8 +1458,7 @@ acc100_dma_fill_blk_type_in(struct acc100_dma_req_desc *desc,