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 082CAA0350 for ; Mon, 21 Feb 2022 16:42:15 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 02E574013F; Mon, 21 Feb 2022 16:42:15 +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 8783D4013F for ; Mon, 21 Feb 2022 16:42:13 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645458133; 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=4m290TQ3gk/fesD/uuJRmW6x8WdfT6G7PY9Dvbzujrc=; b=A0ZNH7wOuGlwttUDdmBYn/1txUMVPnbBezsK8wR8F9F/noqxKPdGvFsG2OsN7/5fEQ/6d/ EUmJBS1bZuUKfIvjisLsWrPEe0BRion3d5CyiFjJR5PHeaKhApiBAUchuVbSC28fW3KAFs BnllMpimuHK6RB4ZBq8PJWl6Kra4aj0= 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-103-qO2RredwPii0vRTkKTN2vw-1; Mon, 21 Feb 2022 10:42:10 -0500 X-MC-Unique: qO2RredwPii0vRTkKTN2vw-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 9F5621853028; Mon, 21 Feb 2022 15:42:09 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id BCBF57E2E8; Mon, 21 Feb 2022 15:41:45 +0000 (UTC) From: Kevin Traynor To: Yunjian Wang Cc: David Marchand , dpdk stable Subject: patch 'mem: check allocation in dynamic hugepage init' has been queued to stable release 21.11.1 Date: Mon, 21 Feb 2022 15:35:43 +0000 Message-Id: <20220221153625.152324-154-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-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 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/1058b2c36938b2b6f865d810cd8f9ef3d3011fbb Thanks. Kevin --- >From 1058b2c36938b2b6f865d810cd8f9ef3d3011fbb Mon Sep 17 00:00:00 2001 From: Yunjian Wang Date: Tue, 14 Dec 2021 21:30:25 +0800 Subject: [PATCH] mem: check allocation in dynamic hugepage init [ upstream commit 5f69ebbd85300a197bbe9e6a630642352f5aba39 ] The function malloc() could return NULL, the return value need to be checked. Fixes: 6f63858e55e6 ("mem: prevent preallocated pages from being freed") Signed-off-by: Yunjian Wang Reviewed-by: David Marchand --- lib/eal/common/eal_common_dynmem.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/eal/common/eal_common_dynmem.c b/lib/eal/common/eal_common_dynmem.c index 7c5437ddfa..c1e1889f5c 100644 --- a/lib/eal/common/eal_common_dynmem.c +++ b/lib/eal/common/eal_common_dynmem.c @@ -305,4 +305,8 @@ eal_dynmem_hugepage_init(void) pages = malloc(sizeof(*pages) * needed); + if (pages == NULL) { + RTE_LOG(ERR, EAL, "Failed to malloc pages\n"); + return -1; + } /* do not request exact number of pages */ -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-21 15:22:47.904276193 +0000 +++ 0154-mem-check-allocation-in-dynamic-hugepage-init.patch 2022-02-21 15:22:44.304704606 +0000 @@ -1 +1 @@ -From 5f69ebbd85300a197bbe9e6a630642352f5aba39 Mon Sep 17 00:00:00 2001 +From 1058b2c36938b2b6f865d810cd8f9ef3d3011fbb Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 5f69ebbd85300a197bbe9e6a630642352f5aba39 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org