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 266E2A0350 for ; Mon, 21 Feb 2022 16:40:52 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 209C74068C; Mon, 21 Feb 2022 16:40:52 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 9D4F74013F for ; Mon, 21 Feb 2022 16:40:50 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645458050; 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=zq40TJ2fsDlzn5trBcf8af87LPPgbYwrNeViDjlSn8k=; b=ODX66m5eAD2y/qXCLvp91GDz+fOHyiZcATP++s8WA72wRiS1ip6mogRVvXNicVdtxI4fk6 A5ckAZptmn651QijEu0Rw+aAj96K9RSF+zrhbL9oTRcttAgM2ehM7yR9fOvfJRROtskCmN dpxL9jj8Cf7KN7cnbDJ1TFTtvTfY33g= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-441-1lFEbTb6OZ2yWy3PkDpS3Q-1; Mon, 21 Feb 2022 10:40:46 -0500 X-MC-Unique: 1lFEbTb6OZ2yWy3PkDpS3Q-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A149D8144E3; Mon, 21 Feb 2022 15:40:44 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id 325237B9D9; Mon, 21 Feb 2022 15:40:42 +0000 (UTC) From: Kevin Traynor To: Zhihong Wang Cc: Liang Ma , =?UTF-8?q?Morten=20Br=C3=B8rup?= , Konstantin Ananyev , dpdk stable Subject: patch 'ring: fix overflow in memory size calculation' has been queued to stable release 21.11.1 Date: Mon, 21 Feb 2022 15:35:12 +0000 Message-Id: <20220221153625.152324-123-ktraynor@redhat.com> In-Reply-To: <20220221153625.152324-1-ktraynor@redhat.com> References: <20220221153625.152324-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 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 21.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/26/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/5a9f8c2ba46514fd230eb06fbe7832df9b0a4c27 Thanks. Kevin --- >From 5a9f8c2ba46514fd230eb06fbe7832df9b0a4c27 Mon Sep 17 00:00:00 2001 From: Zhihong Wang Date: Tue, 14 Dec 2021 11:30:16 +0800 Subject: [PATCH] ring: fix overflow in memory size calculation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ upstream commit 0e4dc6af06228c8504a5538512cb31ed7bf6cc23 ] Parameters count and esize are both unsigned int, and their product can legaly exceed unsigned int and lead to runtime access violation. Fixes: cc4b218790f6 ("ring: support configurable element size") Signed-off-by: Zhihong Wang Reviewed-by: Liang Ma Reviewed-by: Morten Brørup Acked-by: Konstantin Ananyev --- lib/ring/rte_ring.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/ring/rte_ring.c b/lib/ring/rte_ring.c index 185f9be798..6a94a038c4 100644 --- a/lib/ring/rte_ring.c +++ b/lib/ring/rte_ring.c @@ -76,5 +76,5 @@ rte_ring_get_memsize_elem(unsigned int esize, unsigned int count) } - sz = sizeof(struct rte_ring) + count * esize; + sz = sizeof(struct rte_ring) + (ssize_t)count * esize; sz = RTE_ALIGN(sz, RTE_CACHE_LINE_SIZE); return sz; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-21 15:22:47.271244875 +0000 +++ 0123-ring-fix-overflow-in-memory-size-calculation.patch 2022-02-21 15:22:44.250704484 +0000 @@ -1 +1 @@ -From 0e4dc6af06228c8504a5538512cb31ed7bf6cc23 Mon Sep 17 00:00:00 2001 +From 5a9f8c2ba46514fd230eb06fbe7832df9b0a4c27 Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit 0e4dc6af06228c8504a5538512cb31ed7bf6cc23 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org