From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pg0-f44.google.com (mail-pg0-f44.google.com [74.125.83.44]) by dpdk.org (Postfix) with ESMTP id A3FAF9955 for ; Mon, 21 Aug 2017 11:37:14 +0200 (CEST) Received: by mail-pg0-f44.google.com with SMTP id t3so68852668pgt.0 for ; Mon, 21 Aug 2017 02:37:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fridaylinux-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=AiCOtjr1fgmCgerQ4P4IJQLRfle7EkOjXZ52SMBmFT4=; b=wu2he//kQHN9faoJ4zCheKViC71Nql3ltyj+HGlJvWakNCIH0hsVQq7BBLTs998Bp6 jV8K0xDVMLkwqdRtXaKe7V8VHsfdL0/AB+ciswtLh4Wjs1z6rwi7SJY/kTE5pYe5gOWI eexdcyqC/Rl6oVOF9nIOVR9pjNWiz6u19MW6zuL0Dgw3g4eE0+quXPngX2NMD4786ENf 13L1mNMzlUAw8BhN7oKGX1wCx2htV3V8LVAFAAsAvXUWq9N9AP9Pex30PUvgG+w7Fyq6 6PGwCTLU56GLkDdg7ZwuIN60fgPZH4NGZUI3QuPTBdERYsbStAeNY/FbL5BS2LKSd8zy cLGg== 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; bh=AiCOtjr1fgmCgerQ4P4IJQLRfle7EkOjXZ52SMBmFT4=; b=PpzFZSzalcYprxW6MtzO8wmdxbTfEb9P79HQ0RCE/dXoNQSz4TVyKdzggkQiKKVz2Y Juz4QnP13yF8gnPSxjh32uLVcU7nB9QyeyD+8LDhlJ6p/bWWBU/MaA4bcD3r7Wb6zheO OL1IuOHFGVHPmr759hWdqZG6ZUS3OQhuM8tFtkGSlJz69GQ22JlVM2pwzlodHTMcJedC d3/5KNbpjlc8ALCks0AmJzBfmeS9PhBliBf/HL8whHPVhFeGikJGxyaYQMGroDymKLzE JqKbmG9DqHG90CelqQSikjjjuubDty3AwK0rp0L44oY+bSBZkAmbJ3fPtxgRZpddi2z/ Wryg== X-Gm-Message-State: AHYfb5hUERRlVxm/3X04M6x1D1kgA48uwHJLBKWqAaqJqUc+A+Q8iow+ CVXc3/vmLTPocnqy X-Received: by 10.99.113.66 with SMTP id b2mr16479874pgn.216.1503308233965; Mon, 21 Aug 2017 02:37:13 -0700 (PDT) Received: from localhost.localdomain ([45.63.61.64]) by smtp.gmail.com with ESMTPSA id 69sm23355087pfh.186.2017.08.21.02.37.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 21 Aug 2017 02:37:12 -0700 (PDT) From: Yuanhan Liu To: Kuba Kozak Cc: Jingjing Wu , dpdk stable , Yuanhan Liu Date: Mon, 21 Aug 2017 17:31:02 +0800 Message-Id: <1503307878-16728-48-git-send-email-yliu@fridaylinux.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1503307878-16728-1-git-send-email-yliu@fridaylinux.org> References: <1503307878-16728-1-git-send-email-yliu@fridaylinux.org> Subject: [dpdk-stable] patch 'net/i40e: fix parsing QinQ pattern' has been queued to stable release 17.05.2 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: , X-List-Received-Date: Mon, 21 Aug 2017 09:37:15 -0000 Hi, FYI, your patch has been queued to stable release 17.05.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/24/17. So please shout if anyone has objections. Thanks. --yliu --- >>From fde5ad1665fb5fd99ed640719e5e069552031ba7 Mon Sep 17 00:00:00 2001 From: Kuba Kozak Date: Thu, 27 Jul 2017 09:28:22 +0200 Subject: [PATCH] net/i40e: fix parsing QinQ pattern [ upstream commit c2be7f9b232fd6730dcec83555af050941c7805f ] Add check if o_vlan_mask and i_vlan_mask are not a NULL pointer. Coverity issue: 143448 Coverity issue: 143449 Fixes: d37705068ee8 ("net/i40e: parse QinQ pattern") Signed-off-by: Kuba Kozak Acked-by: Jingjing Wu --- drivers/net/i40e/i40e_flow.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c index 24e1c65..c1dac38 100644 --- a/drivers/net/i40e/i40e_flow.c +++ b/drivers/net/i40e/i40e_flow.c @@ -1821,8 +1821,10 @@ i40e_flow_parse_qinq_pattern(__rte_unused struct rte_eth_dev *dev, } /* Get filter specification */ - if ((o_vlan_mask->tci == rte_cpu_to_be_16(I40E_TCI_MASK)) && - (i_vlan_mask->tci == rte_cpu_to_be_16(I40E_TCI_MASK))) { + if ((o_vlan_mask != NULL) && (o_vlan_mask->tci == + rte_cpu_to_be_16(I40E_TCI_MASK)) && + (i_vlan_mask != NULL) && + (i_vlan_mask->tci == rte_cpu_to_be_16(I40E_TCI_MASK))) { filter->outer_vlan = rte_be_to_cpu_16(o_vlan_spec->tci) & I40E_TCI_MASK; filter->inner_vlan = rte_be_to_cpu_16(i_vlan_spec->tci) -- 2.7.4