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 3CFA8A0524 for ; Fri, 5 Feb 2021 12:30:36 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 335374067B; Fri, 5 Feb 2021 12:30:36 +0100 (CET) Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by mails.dpdk.org (Postfix) with ESMTP id AB711188945 for ; Fri, 5 Feb 2021 12:30:34 +0100 (CET) Received: by mail-wr1-f52.google.com with SMTP id l12so7335480wry.2 for ; Fri, 05 Feb 2021 03:30:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9eLECLH9r96ifR24Bo5IlBh7gGVVlWrJQcpJmaxS7lk=; b=DWDIIbE9AlNaa7LxJeD9yVXpUOykpKCZXcdYPD2Yw7G9YD3VMApsR0okUdKS4dGM8l ObCGRbq9aKATzcbKlC9Ys6d8lLb7Y1d/yoN6qoulkHEXm/ZtTfv/XMi6qa1Xx/UkIJrp fz9fwH9cRIPnJHMHo5Yg7aMxMgLT/DjWjmgT1ijtOtZOm68KuqQ69395ZSVizE2p8IHB gq3yYh3cIb1/Ulnq0ZTmdkU0mLyHk3Rcc/XFwtEPWROklexkCS01TpO7DvQ6vVVU7gOK sWALLrzTh0Dnv5LtIhQprllEWknN4KuBf2P4UkZvJY56cU/Ko3pFgGw3yhM1b+1OcHHx MhZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9eLECLH9r96ifR24Bo5IlBh7gGVVlWrJQcpJmaxS7lk=; b=c69W9zxGjwm+i5XLerEm9BLYuef9nfooS5v6EB9mOma6/eDhVOGiu7hIEfWSC7bFZU WB2xSGEAi64Rc+09GI4E2MpFNV8UpdIyYQJuUd5b/AkaCU5d5Ue0JfOUw7hOeq1T0XqS JRkXBWnCmy8Fo183/ir8cXbEyTiMN86b660pjnovfVgI10C1vfGPt+TyjbZyeDTp+R8O uvomjbOWIBD8Fvz9iTAVwkwhjBprClHE+y6Tf4XUbKltiBp46jXV9f68Dy2IoAbH184i IpFDvy/A7oG+OCgVDwgrDGEJwxhi7MBJqUQAzWntE2UMYyCgk7EUIUPdelzZMf3ozoT2 +x9Q== X-Gm-Message-State: AOAM532gb8yElr0rcvne156lA88cDQyeqBtwf9R6xD1VHShdO2OZEeH5 K0l1kjC9MCn1uiAoxwEe+Xs= X-Google-Smtp-Source: ABdhPJxFzROE1cE0/lrkeVgsrqzZ7wL6bTeJlqxD0Qk0uyKe05Za8FtRZdmXHvDRHaLh5qJuOTn73A== X-Received: by 2002:adf:8b47:: with SMTP id v7mr4457332wra.133.1612524634501; Fri, 05 Feb 2021 03:30:34 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id j14sm13692565wrd.36.2021.02.05.03.30.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 03:30:33 -0800 (PST) From: luca.boccassi@gmail.com To: Murphy Yang Cc: Qi Zhang , dpdk stable Date: Fri, 5 Feb 2021 11:16:31 +0000 Message-Id: <20210205111920.1272063-105-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210205111920.1272063-1-luca.boccassi@gmail.com> References: <20210205111920.1272063-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/i40e: add null input checks' has been queued to stable release 20.11.1 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.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/07/21. 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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/920206bad83711cf9fa539e94e780275447ba5cb Thanks. Luca Boccassi --- >From 920206bad83711cf9fa539e94e780275447ba5cb Mon Sep 17 00:00:00 2001 From: Murphy Yang Date: Fri, 8 Jan 2021 08:30:11 +0000 Subject: [PATCH] net/i40e: add null input checks [ upstream commit 696ad314ccfcd708534aeaefbd946f872278e023 ] Pointer 'NULL' check for 'mac_addr' or 'conf' within i40e PMD APIs. Fixes: 66c78f4799ff ("net/i40e: add support for packet template to flow director") Fixes: 04b443fb2c43 ("net/i40e: fix port id type") Signed-off-by: Murphy Yang Acked-by: Qi Zhang --- drivers/net/i40e/rte_pmd_i40e.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/net/i40e/rte_pmd_i40e.c b/drivers/net/i40e/rte_pmd_i40e.c index 790d042002..2e34140c5b 100644 --- a/drivers/net/i40e/rte_pmd_i40e.c +++ b/drivers/net/i40e/rte_pmd_i40e.c @@ -2366,6 +2366,9 @@ rte_pmd_i40e_add_vf_mac_addr(uint16_t port, uint16_t vf_id, struct i40e_mac_filter_info mac_filter; int ret; + if (mac_addr == NULL) + return -EINVAL; + if (i40e_validate_mac_addr((u8 *)mac_addr) != I40E_SUCCESS) return -EINVAL; @@ -3042,6 +3045,9 @@ int rte_pmd_i40e_flow_add_del_packet_template( RTE_ETH_VALID_PORTID_OR_ERR_RET(port, -ENODEV); + if (conf == NULL) + return -EINVAL; + if (!is_i40e_supported(dev)) return -ENOTSUP; -- 2.29.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-05 11:18:33.946698368 +0000 +++ 0105-net-i40e-add-null-input-checks.patch 2021-02-05 11:18:28.958694006 +0000 @@ -1 +1 @@ -From 696ad314ccfcd708534aeaefbd946f872278e023 Mon Sep 17 00:00:00 2001 +From 920206bad83711cf9fa539e94e780275447ba5cb Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 696ad314ccfcd708534aeaefbd946f872278e023 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org