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 C95DEA0524 for ; Fri, 5 Feb 2021 12:38:47 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C30C2188A5E; Fri, 5 Feb 2021 12:38:47 +0100 (CET) Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by mails.dpdk.org (Postfix) with ESMTP id D53DE188A5B for ; Fri, 5 Feb 2021 12:38:46 +0100 (CET) Received: by mail-wm1-f49.google.com with SMTP id c127so5645867wmf.5 for ; Fri, 05 Feb 2021 03:38:46 -0800 (PST) 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=AFDJayo//0jYNS4piSncQqWBELyB/vERD4OwqKOVoHE=; b=gksIgyE8449EnFb+tontisAhLwf7v1kvfWy/QguH/aeMJ5EY2a1S+RsazW13ukc4O3 9GqaQDW+5gftzACyTyrxPQTYUY+16WW8gilPTvVatZXZusNkBpv76itvd24KNLe4jyVb 6r4cfynZ2HuBJDL+3HBSdxn/N4iW8l2ipR9r8NrEPHinchfklHRD07yx0k1VZ0FRxDqo VGUPeeFLZJFBhAe5NmeIt7YW+PND+0A8Z3cdQscSRMvezg0/SPy2eD0d3tq+6aflq2TP GigGgTW7lnF5dNh79saLvAOMBnYFjgnWfBmEGVQunzMke7tdUkhGkdLOsfuLXGK1BzwI 584Q== 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=AFDJayo//0jYNS4piSncQqWBELyB/vERD4OwqKOVoHE=; b=BWVmH+7JuUhBRqfpAZlNxeVCw3Z8LFyxGj6zdD8rEs8YhOhW/HbCViWayVpSnvPJc4 4VWg5UWqJdddF62wj9HphQaKkyjQFV9SJRPtR4Wf0yQK5NOgjhLzfObtT0DyFOym7SDb leUzjkQgkf5AVupPO2amHATAf/KSJGyDhDQEjfsVi0pTb+YTmVQrRfnW81Ki+9q7zXmY DI5ntBPiiKkdZYQwI9WpMq/uinmx5Oz2N4I/X4yAk3gcs68BXk/fEsIDsn0ITofWP6BD 0ohp3CKfjoGArhhb5jzDR8C2v4BnRo1kOKJy51nC/qsHCucA5TqvnAbl8uTDSe36nCND dHCQ== X-Gm-Message-State: AOAM533HfTRDTahVGDj2mOqUKQGVDPVD6mmUy+86wCqnRSAi+nOd3Tnq koDNql6+MCkn66nDCEqwLBE= X-Google-Smtp-Source: ABdhPJyI/dddDWHyo7SNeXCKYaMkN+7BSVOPkHGPc9WnX5mR5LlvrHkYDbJ3/zVC3wemyjPq6K8FZA== X-Received: by 2002:a1c:5608:: with SMTP id k8mr3151347wmb.91.1612525126653; Fri, 05 Feb 2021 03:38:46 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id d30sm13552497wrc.92.2021.02.05.03.38.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 03:38:45 -0800 (PST) From: luca.boccassi@gmail.com To: Yuri Chipchev Cc: Liron Himi , dpdk stable Date: Fri, 5 Feb 2021 11:19:00 +0000 Message-Id: <20210205111920.1272063-254-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210205111920.1272063-1-luca.boccassi@gmail.com> References: <20210205111920.1272063-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/mvpp2: fix stack corruption' has been queued to stable release 20.11.1 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.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/07/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/9057ace8361570b013991427674ee7e6f47e66d4 Thanks. Luca Boccassi --- >From 9057ace8361570b013991427674ee7e6f47e66d4 Mon Sep 17 00:00:00 2001 From: Yuri Chipchev Date: Wed, 27 Jan 2021 18:09:15 +0200 Subject: [PATCH] net/mvpp2: fix stack corruption [ upstream commit 8ce3c5db531eaf339ed60fb0ef97eab05c77846b ] Fixes stack corruption in mrvl_fill_bpool function in case num > MRVL_PP2_RXD_MAX Fixes: c3637258d894 ("net/mrvl: fix Rx descriptors number") Signed-off-by: Yuri Chipchev Reviewed-by: Liron Himi --- drivers/net/mvpp2/mrvl_ethdev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/mvpp2/mrvl_ethdev.c b/drivers/net/mvpp2/mrvl_ethdev.c index f25cf9e46d..93fb30cdb8 100644 --- a/drivers/net/mvpp2/mrvl_ethdev.c +++ b/drivers/net/mvpp2/mrvl_ethdev.c @@ -1614,8 +1614,8 @@ mrvl_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on) static int mrvl_fill_bpool(struct mrvl_rxq *rxq, int num) { - struct buff_release_entry entries[MRVL_PP2_RXD_MAX]; - struct rte_mbuf *mbufs[MRVL_PP2_RXD_MAX]; + struct buff_release_entry entries[num]; + struct rte_mbuf *mbufs[num]; int i, ret; unsigned int core_id; struct pp2_hif *hif; -- 2.29.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-05 11:18:40.360216153 +0000 +++ 0254-net-mvpp2-fix-stack-corruption.patch 2021-02-05 11:18:29.270699946 +0000 @@ -1 +1 @@ -From 8ce3c5db531eaf339ed60fb0ef97eab05c77846b Mon Sep 17 00:00:00 2001 +From 9057ace8361570b013991427674ee7e6f47e66d4 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 8ce3c5db531eaf339ed60fb0ef97eab05c77846b ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 1d67f2abf1..2f5b2f256b 100644 +index f25cf9e46d..93fb30cdb8 100644