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 CA27AA034F for ; Tue, 1 Mar 2022 11:45:16 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C518F40DF6; Tue, 1 Mar 2022 11:45:16 +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 890F7407FF for ; Tue, 1 Mar 2022 11:45:15 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646131515; 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=XmWA7lY1iU8UGBzkEQiwq/ygfdS2DLtJgsloisxb/NM=; b=duoN8ZZ3OjcjoLcrpGjZjEUmFCWDo7Y6hf5eEh1T1hhylrHF7K6pmoU8kbNoB4Uzu603e/ JtdtALq29De3lKL1sO1GiggSJioaFXrREmKHTUZqfx746EVUj/H7MOv8m1BWC1gJ7uKhRD g2WyN2Bq5PWSBfb3uWS1mOo9rUtMSGg= 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-159-GQ8-sEICNkKOdvhVPtpaqA-1; Tue, 01 Mar 2022 05:45:10 -0500 X-MC-Unique: GQ8-sEICNkKOdvhVPtpaqA-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C71DD100C609; Tue, 1 Mar 2022 10:45:09 +0000 (UTC) Received: from rh.Home (unknown [10.39.194.142]) by smtp.corp.redhat.com (Postfix) with ESMTP id BAD4B752D3; Tue, 1 Mar 2022 10:45:07 +0000 (UTC) From: Kevin Traynor To: Weiguo Li Cc: Andrew Rybchenko , dpdk stable Subject: patch 'net/sfc: fix memory allocation size for cache' has been queued to stable release 21.11.1 Date: Tue, 1 Mar 2022 10:42:15 +0000 Message-Id: <20220301104300.334382-59-ktraynor@redhat.com> In-Reply-To: <20220301104300.334382-1-ktraynor@redhat.com> References: <20220301104300.334382-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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 03/06/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/ae2f030ad19a8b3d452cea3c73422dce35c6ed20 Thanks. Kevin --- >From ae2f030ad19a8b3d452cea3c73422dce35c6ed20 Mon Sep 17 00:00:00 2001 From: Weiguo Li Date: Tue, 21 Dec 2021 14:41:22 +0800 Subject: [PATCH] net/sfc: fix memory allocation size for cache [ upstream commit b0fed38467713807ac03d50ae7c02ef4c320470a ] The size of unit cache should be sizeof(**cache) instead of sizeof(*cache). Memory reallocation is inadequate by sizeof(*cache) for the platform whose size of pointer is 32-bits. Found by coccinelle (see https://coccinelle.gitlabpages.inria.fr/website) script. Fixes: 63abf8d29225 ("net/sfc: support SW stats groups") Signed-off-by: Weiguo Li Reviewed-by: Andrew Rybchenko --- drivers/net/sfc/sfc_sw_stats.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/sfc/sfc_sw_stats.c b/drivers/net/sfc/sfc_sw_stats.c index 70259660c0..81f5aa3cc4 100644 --- a/drivers/net/sfc/sfc_sw_stats.c +++ b/drivers/net/sfc/sfc_sw_stats.c @@ -778,5 +778,5 @@ sfc_sw_xstats_configure(struct sfc_adapter *sa) memset(*reset_vals, 0, nb_supported * sizeof(**reset_vals)); - *cache = rte_realloc(*cache, cache_count * sizeof(*cache), 0); + *cache = rte_realloc(*cache, cache_count * sizeof(**cache), 0); if (*cache == NULL) { rc = ENOMEM; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-01 10:41:03.007120920 +0000 +++ 0059-net-sfc-fix-memory-allocation-size-for-cache.patch 2022-03-01 10:41:01.345244106 +0000 @@ -1 +1 @@ -From b0fed38467713807ac03d50ae7c02ef4c320470a Mon Sep 17 00:00:00 2001 +From ae2f030ad19a8b3d452cea3c73422dce35c6ed20 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit b0fed38467713807ac03d50ae7c02ef4c320470a ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org