From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 4ADC9A04B5 for ; Tue, 3 Dec 2019 19:28:24 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 3E4B91BF76; Tue, 3 Dec 2019 19:28:24 +0100 (CET) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by dpdk.org (Postfix) with ESMTP id 19EE4235 for ; Tue, 3 Dec 2019 19:28:22 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575397701; 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=j3C9ARBnN3NyRu+lSeVMNGpHqFmPIKYYZR03/ty6WWA=; b=aFkrpfAjWC63KpGJE8hMxIbA+fTzshwxnY5GlfXzwJA4/FmQuCLYNfRaNtiVaFbMPcV/vf DCBgitQ+gd6BhNjHMEF/8fsRNI8lmnGVuOdkljy0Uk7PgginDmrFbcOFLPZFwiEDF0t84Z OfR7uI6ktXRQ0y0C5FvYigH+E/6LY9c= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-411-fe95gwWSMAuUaw6zG9svUw-1; Tue, 03 Dec 2019 13:28:15 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 50D03477; Tue, 3 Dec 2019 18:28:14 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-10.ams2.redhat.com [10.36.117.10]) by smtp.corp.redhat.com (Postfix) with ESMTP id EA8885C240; Tue, 3 Dec 2019 18:28:12 +0000 (UTC) From: Kevin Traynor To: Hui Zhao Cc: David Marchand , Maxime Coquelin , Chas Williams , dpdk stable Date: Tue, 3 Dec 2019 18:26:32 +0000 Message-Id: <20191203182714.17297-23-ktraynor@redhat.com> In-Reply-To: <20191203182714.17297-1-ktraynor@redhat.com> References: <20191203182714.17297-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-MC-Unique: fe95gwWSMAuUaw6zG9svUw-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'net/bonding: fix OOB access in other aggregator modes' has been queued to LTS release 18.11.6 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 LTS release 18.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/10/19. 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 rebasi= ng (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-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/47233bb7f2eb73cb82= d08ede312469951a06dcb8 Thanks. Kevin. --- >From 47233bb7f2eb73cb82d08ede312469951a06dcb8 Mon Sep 17 00:00:00 2001 From: Hui Zhao Date: Thu, 21 Mar 2019 21:28:14 +0100 Subject: [PATCH] net/bonding: fix OOB access in other aggregator modes [ upstream commit dfbc596c2e1418780f77954e1859ffec9aebfe4f ] slave aggregator_port_id is in [0, RTE_MAX_ETHPORTS-1] range. If RTE_MAX_ETHPORTS is > 8, we can hit out of bound accesses on agg_bandwidth[] and agg_count[] arrays. Fixes: 6d72657ce379 ("net/bonding: add other aggregator modes") Signed-off-by: Hui Zhao Signed-off-by: David Marchand Reviewed-by: Maxime Coquelin Acked-by: Chas Williams --- drivers/net/bonding/rte_eth_bond_8023ad.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/bonding/rte_eth_bond_8023ad.c b/drivers/net/bondin= g/rte_eth_bond_8023ad.c index 3943ec139..5004898e7 100644 --- a/drivers/net/bonding/rte_eth_bond_8023ad.c +++ b/drivers/net/bonding/rte_eth_bond_8023ad.c @@ -670,6 +670,6 @@ selection_logic(struct bond_dev_private *internals, uin= t16_t slave_id) =09uint16_t slaves_count, new_agg_id, i, j =3D 0; =09uint16_t *slaves; -=09uint64_t agg_bandwidth[8] =3D {0}; -=09uint64_t agg_count[8] =3D {0}; +=09uint64_t agg_bandwidth[RTE_MAX_ETHPORTS] =3D {0}; +=09uint64_t agg_count[RTE_MAX_ETHPORTS] =3D {0}; =09uint16_t default_slave =3D 0; =09uint16_t mode_count_id; --=20 2.21.0 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092019-12-03 17:29:53.179221724 +0000 +++ 0023-net-bonding-fix-OOB-access-in-other-aggregator-modes.patch=092019-= 12-03 17:29:51.740750161 +0000 @@ -1 +1 @@ -From dfbc596c2e1418780f77954e1859ffec9aebfe4f Mon Sep 17 00:00:00 2001 +From 47233bb7f2eb73cb82d08ede312469951a06dcb8 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit dfbc596c2e1418780f77954e1859ffec9aebfe4f ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index c6a645a65..7d8da2b31 100644 +index 3943ec139..5004898e7 100644 @@ -25 +26 @@ -@@ -671,6 +671,6 @@ selection_logic(struct bond_dev_private *internals, ui= nt16_t slave_id) +@@ -670,6 +670,6 @@ selection_logic(struct bond_dev_private *internals, ui= nt16_t slave_id)