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 86BEEA0350 for ; Mon, 21 Feb 2022 16:40:55 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 81CBE4013F; Mon, 21 Feb 2022 16:40:55 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id BFA4841147 for ; Mon, 21 Feb 2022 16:40:53 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645458053; 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=AEvadrgtcvF3Om0+W3ITwM6jBfZyhkoAc7dg3AxD1OU=; b=HfNU/ksmT5sMpisjESwP6rzB0JO9x7zAjyG7EhavSOv7uVpHhmNMlZb7umzdVKQHx3twCk sJboPfcdqraZBj9OKta6ZoNzgQy15gdUduTv3UBNgfQZotPiDmutNwMZ4/YO0aotkXH9ZC n4U7+sBbt+KM7Ysos7j70N17kX2Vu1U= 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-464-waYHLCkxN1ujBlGgb3_lpw-1; Mon, 21 Feb 2022 10:40:50 -0500 X-MC-Unique: waYHLCkxN1ujBlGgb3_lpw-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 41D3F1853020; Mon, 21 Feb 2022 15:40:49 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id 36CB67B9D9; Mon, 21 Feb 2022 15:40:48 +0000 (UTC) From: Kevin Traynor To: Weiguo Li Cc: John Daley , dpdk stable Subject: patch 'net/enic: fix dereference before null check' has been queued to stable release 21.11.1 Date: Mon, 21 Feb 2022 15:35:15 +0000 Message-Id: <20220221153625.152324-126-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/90386f428c9006dfde5c9e0983ad7bdfa3950c5a Thanks. Kevin --- >From 90386f428c9006dfde5c9e0983ad7bdfa3950c5a Mon Sep 17 00:00:00 2001 From: Weiguo Li Date: Tue, 25 Jan 2022 20:00:49 +0800 Subject: [PATCH] net/enic: fix dereference before null check [ upstream commit a5f42986968a0699e070c56f1033aee5f90d2c12 ] Move memcpy to 'ah->key' after 'ah' null check Fixes: bb66d562aefc ("net/enic: share flow actions with same signature") Signed-off-by: Weiguo Li Reviewed-by: John Daley --- drivers/net/enic/enic_fm_flow.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/enic/enic_fm_flow.c b/drivers/net/enic/enic_fm_flow.c index bef842d460..ab73cd8530 100644 --- a/drivers/net/enic/enic_fm_flow.c +++ b/drivers/net/enic/enic_fm_flow.c @@ -2373,9 +2373,9 @@ enic_action_handle_get(struct enic_flowman *fm, struct fm_action *action_in, ah = calloc(1, sizeof(*ah)); - memcpy(&ah->key, action_in, sizeof(struct fm_action)); if (ah == NULL) return rte_flow_error_set(error, ENOMEM, RTE_FLOW_ERROR_TYPE_HANDLE, NULL, "enic: calloc(fm-action)"); + memcpy(&ah->key, action_in, sizeof(struct fm_action)); args[0] = FM_ACTION_ALLOC; args[1] = fm->cmd.pa; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-21 15:22:47.327272253 +0000 +++ 0126-net-enic-fix-dereference-before-null-check.patch 2022-02-21 15:22:44.253704491 +0000 @@ -1 +1 @@ -From a5f42986968a0699e070c56f1033aee5f90d2c12 Mon Sep 17 00:00:00 2001 +From 90386f428c9006dfde5c9e0983ad7bdfa3950c5a Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit a5f42986968a0699e070c56f1033aee5f90d2c12 ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ -index bf04d714d0..d8718d17ef 100644 +index bef842d460..ab73cd8530 100644 @@ -21 +22 @@ -@@ -2522,9 +2522,9 @@ enic_action_handle_get(struct enic_flowman *fm, struct fm_action *action_in, +@@ -2373,9 +2373,9 @@ enic_action_handle_get(struct enic_flowman *fm, struct fm_action *action_in,