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 E2A7BA04A3 for ; Fri, 5 Jun 2020 20:26:08 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id D63251D510; Fri, 5 Jun 2020 20:26:08 +0200 (CEST) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by dpdk.org (Postfix) with ESMTP id 0D0CD1D52B for ; Fri, 5 Jun 2020 20:26:06 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591381566; 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=/TBlPTqjBLvSiDEi/D7A/fJudUipTFTq12wWUjbaJJs=; b=WC+BUL0+wNTqHQ8IuYPHqKF3ohgo70ymzzTEGNHR4/hV73lP+kGSN3n7AN1ezXyXZSU0xi O9bQ7r38qacK/3rwPHutgU/QsTEWewx4RPZFyfNX0chXQcqy2+k0OYguyA0VxQWBSTv7yO gulztefV8/2xutLGQ8JFBTkZzYeHr6M= 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-223-URecOAStP06ODRvdICavLA-1; Fri, 05 Jun 2020 14:26:03 -0400 X-MC-Unique: URecOAStP06ODRvdICavLA-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 680AA81CBE3; Fri, 5 Jun 2020 18:26:02 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.130]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7A587610F2; Fri, 5 Jun 2020 18:26:01 +0000 (UTC) From: Kevin Traynor To: Yunjian Wang Cc: Harman Kalra , dpdk stable Date: Fri, 5 Jun 2020 19:24:12 +0100 Message-Id: <20200605182525.22483-15-ktraynor@redhat.com> In-Reply-To: <20200605182525.22483-1-ktraynor@redhat.com> References: <20200605182525.22483-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/octeontx: fix dangling pointer on init failure' has been queued to LTS release 18.11.9 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.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/10/20. 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-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/e3217b5520e71d401785aa63649ac429603065e9 Thanks. Kevin. --- >From e3217b5520e71d401785aa63649ac429603065e9 Mon Sep 17 00:00:00 2001 From: Yunjian Wang Date: Tue, 7 Apr 2020 19:35:43 +0800 Subject: [PATCH] net/octeontx: fix dangling pointer on init failure [ upstream commit 5ed5df8073c80d1af9ec8c89a8b2a5299463058d ] When octeontx_create() is cleaning up, it does not correctly set the mac_addrs variable to NULL, which will lead to a double free. Fixes: 9e399b88ce2f ("net/octeontx: fix memory leak of MAC address table") Signed-off-by: Yunjian Wang Acked-by: Harman Kalra --- drivers/net/octeontx/octeontx_ethdev.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/octeontx/octeontx_ethdev.c b/drivers/net/octeontx/octeontx_ethdev.c index ac193ace43..17128da994 100644 --- a/drivers/net/octeontx/octeontx_ethdev.c +++ b/drivers/net/octeontx/octeontx_ethdev.c @@ -1107,4 +1107,5 @@ octeontx_create(struct rte_vdev_device *dev, int port, uint8_t evdev, free_mac_addrs: rte_free(data->mac_addrs); + data->mac_addrs = NULL; err: if (nic) -- 2.21.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-06-05 19:20:51.756091325 +0100 +++ 0015-net-octeontx-fix-dangling-pointer-on-init-failure.patch 2020-06-05 19:20:50.732042585 +0100 @@ -1 +1 @@ -From 5ed5df8073c80d1af9ec8c89a8b2a5299463058d Mon Sep 17 00:00:00 2001 +From e3217b5520e71d401785aa63649ac429603065e9 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 5ed5df8073c80d1af9ec8c89a8b2a5299463058d ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index ea3b278a15..d5371ae07d 100644 +index ac193ace43..17128da994 100644 @@ -22 +23 @@ -@@ -1455,4 +1455,5 @@ octeontx_create(struct rte_vdev_device *dev, int port, uint8_t evdev, +@@ -1107,4 +1107,5 @@ octeontx_create(struct rte_vdev_device *dev, int port, uint8_t evdev,