From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM02-BL2-obe.outbound.protection.outlook.com (mail-bl2nam02on0079.outbound.protection.outlook.com [104.47.38.79]) by dpdk.org (Postfix) with ESMTP id E32B12BD1 for ; Mon, 10 Apr 2017 09:20:22 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-cavium-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=t6cwycCRmGVTpPbxrbUa+hsEYyAaKcFzLTdf83uhwEU=; b=EcSsq/ENz/DOVznRpBLMYkH2uChi6/9qmL7SzA7eoPZzk7Va9JecElI98eTpgfUG0Kt114tOT8M3UsAisGx0fmP+UBnpoCsjfgnFY2bS5CcGpgS1pBws+Z+oaxPWe2gi9BNaHf8YF1jIcR+eKHrqNu0L+kRATtyzE68X30k3hqo= Authentication-Results: intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=none action=none header.from=caviumnetworks.com; Received: from lio357.in.caveonetworks.com (14.140.2.178) by DM3PR07MB2283.namprd07.prod.outlook.com (10.164.33.157) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1019.17; Mon, 10 Apr 2017 07:20:20 +0000 From: Shijith Thotton To: Ferruh Yigit Cc: dev@dpdk.org Date: Mon, 10 Apr 2017 12:48:56 +0530 Message-Id: <1491808736-14239-2-git-send-email-shijith.thotton@caviumnetworks.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1491808736-14239-1-git-send-email-shijith.thotton@caviumnetworks.com> References: <1491805567-10743-1-git-send-email-shijith.thotton@caviumnetworks.com> <1491808736-14239-1-git-send-email-shijith.thotton@caviumnetworks.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [14.140.2.178] X-ClientProxiedBy: BM1PR01CA0042.INDPRD01.PROD.OUTLOOK.COM (10.163.199.14) To DM3PR07MB2283.namprd07.prod.outlook.com (10.164.33.157) X-MS-Office365-Filtering-Correlation-Id: a7bb65d4-7f7a-4b55-5a08-08d47fe20c5b X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(201703131423075)(201703031133081); SRVR:DM3PR07MB2283; X-Microsoft-Exchange-Diagnostics: 1; DM3PR07MB2283; 3:Pq4zDvS0CSFXB8+HD4iVZPZlUmd8y5sU/IO6seEqtJ3qSxYV0C5MijAru2zCOMl7J445M8S/V+CgIonHrLRVhyvq8Ed6m+cYm9gWjG781bk7QbR6pXHVvCSEh2dWlbEO5QlvVK4s7zyFqSvAR60/MBVyMcM2vht6f78Gb0QXKfMSLiMU6zRi/1x8aPPsZLpZCJREbHi/s2t+53He2ACE0niajvrsLoDAKxsn3XCCUa3oERhPd5k1z0gbqW/nPjBZQcK28SllnSCRQVyNUtl+8qJtB/fajyAgQpvUE5oSO8OUjokz3K0O097rSWHnTTgL8o1e48cyN1G5ALCHZCoKsQ==; 25:e05WdZ6HM0Mp1yObHEKtjAidAVqTPxy7u7SptxvYuNNVCG6n0YPCTC2RJGtuDkMWfvrrxgHlcz3VgPg5vHwsYaSLWyBSbrhVCr4rFopTlALtK8/0TGqt0CkjRGMYal2wjwmI3pzo1V4bEiice5/gI2j9Rc5WRfk6gQlQ5z8F223q5wHAXAd/Eo9W31Terq2txmDS5kpc50N6zMpAScZTq0sNpFZLdYcnhPzbd+QnzPqDwenVTPbQBkMgWTRDiFkLVWamVjVxXl906sEjzdNN8kH4r11WkQ7U3iEbOZSlO1ueFOMv3/Mov2ItH+mMalXGkVrQCFduqnFNlrGwZI3NFzXr7WfPLqnRg85v8OJh2QTQIP3RAXZXVaqS4L0Qzlui7y8K1pa6g3/WefVFurEJTLSbJBwdiWmoGiAllJfKF2o/qiO+zfRHarJreipRI701OCyz39Nt2tkrmqhXaQvuuw== X-Microsoft-Exchange-Diagnostics: 1; DM3PR07MB2283; 31:JzIGN5UYEq6iE00Y5Rs2EfB/ZJ4ohynkC7SBZuUg4QSlN3Ndc8JB5PBdASsOhQu5Q7Psx2BaUxL1BjiwnRT0kQCFANqR7WiQLmJtuhP8Ifq7XZKnKIOpAJ4EnrvTKchUaPuIuYxghFpxWxTsz9PTQn8D8baVWoJIXIgeuyCgwKwRZP5r6y/QgLsDizGpULsa5vrFkdcthdouWqDQq7Asg1xUSMdUW8yzNyqR8SUYNUDpmmf+9r3c5EvDLi827gGoUy6D/sCZ217EthU5uMTGIQ==; 20:WNCafjojmO+ykvapCxbPOXiObrUCoWyiT+IBpTt4JWczkGFD7ubSPW1RCug86BXP4WCcKzxlFcigIViVARHuBI7WpwFaTDiEvz6PVhmfxteqD0ZzQUq0JjRomMD5+OQ7iFatVVkyr5/6WHc9s12ZiQfLDsycu9xhFGY8ckzhrVYhiWYKYM/b9OkqWiw4cPbOwU5A+4X8NHvVh+/nLMoLwZpm73d98JY7LZLEorvqOoWlsfmbnv44bBWMi1lQlORbum9PBcNMOb5vzkKOkRBK6eL5DVLKtmu8H/IYHpKqvfGn8NaxhgZ4cJjVnTwMBQyJa1fbTAVQ6KhSonkYSdjNiOlozoBzwNmCKK+oyHx59nxNQ96NVzTAfw7qTRZuDOHg4CaGqqzkcN4L1e2MF1ONNSuNDZB0C9UxNwVYBZtqClGXcCZoznCBu4/7NOBxoD8TzbxIJnSPwGghPaWnOiSSG18wPLQbGf1+TUdwG2TJMNY2cwIFGooJvSGmJf4mqYqfIWKXuAc8DqRAbzgOLzeATtXqwkMWa6Pi8THy/IRtC0HF/kDeZK60Mc9f8/lFOl3ZcPfZi001w0aG+EFAONfEYSRIJhMziUBDZoHAQKn8Gk8= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(601004)(2401047)(8121501046)(5005006)(3002001)(10201501046)(93006095)(6041248)(201703131423075)(201702281528075)(201703061421075)(20161123564025)(20161123560025)(20161123555025)(20161123562025)(6072148); SRVR:DM3PR07MB2283; BCL:0; PCL:0; RULEID:; SRVR:DM3PR07MB2283; X-Microsoft-Exchange-Diagnostics: 1; DM3PR07MB2283; 4:az10vcnCddIeQiFOR5ZmdlqKigSc5JRX70gdf2vzut7pQe7fQWoEDzphZO7loxLrx+yBI7ikcZz1USmVY7k0AV7eauHZa+jvxGmJ4NCBdduLNvYFBCsyVxXhzOCXagRdmxwEDPT4t6U8eSOHAJR5qex9carhPJYvOt0CiwRqm2tyXOMXPS1rFGQ16QLxW76F5yKAypS7sk+buFXb0xSxoYopagpjsD2NCDZ/TO9aZENAqowh/rCqOuzLW0jkrLHyf5FFlpi/UMQaJao0rGef0Kj7NNKpU0DZ3tHYqiRn+m58MvGRonC86xLca/kVRTLR6dCQtToqjwcCHvPTdbQc2SsT5ZcLePmBoizbjDQj7zqFdYPXyFv1Wf1pVCYRqgipwVlUMptJQLYDOcmfuUX51XAUiJrNgnq+c9RljNe/8B3/p59hwJl9/EE1UiBv3K9mO5/D7ljpnVHPAn8infWZG+El7c6u3faYv/xbO1pBo4xU+d+Gd2DnHsvlzk/A2Du664Ga8dJS429OGeQux0SG4fR2NJXCRx1ZZ+3eAxu+NEnBhaO23gP2Jc26nnde/gY1gWSgUNVilpbEPltwnHKk40lf4CUP7v6I+PqeGSlZHR8w4vbAiHn3IrtyJqDc66gNsUL4j6MTxXqKv12ogrz0+FVdTkJHLdWuDFzwvewpBepUKLzyVILdjYkZ75T2Pv5r X-Forefront-PRVS: 027367F73D X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(39410400002)(39400400002)(39450400003)(39840400002)(305945005)(7736002)(33646002)(6666003)(4720700003)(53936002)(36756003)(6916009)(6512007)(42882006)(5660300001)(2950100002)(42186005)(66066001)(50986999)(76176999)(47776003)(6506006)(5009440100003)(189998001)(6116002)(6486002)(50226002)(3846002)(8676002)(81166006)(4326008)(2906002)(50466002)(25786009)(110136004)(38730400002)(5003940100001)(48376002)(110426004); DIR:OUT; SFP:1101; SCL:1; SRVR:DM3PR07MB2283; H:lio357.in.caveonetworks.com; FPR:; SPF:None; MLV:nov; PTR:InfoNoRecords; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM3PR07MB2283; 23:U7h7zrRcDaKjMJm9OdfAbJSgNh2gwTXoA7webZnGo?= =?us-ascii?Q?0txdI8f6bFfd2KcTzDZeEKaRmUeYflk2Yc+yU+ZjbouAHe51qN4ZE8eY9lX0?= =?us-ascii?Q?nxXKre5wtZvEsqJZTczFwwB7D/bI7Y76WpGC312qeBR+y0x6Ucc6UJAz6U09?= =?us-ascii?Q?pAqOJG4k9gesd+sjKSnQi1t5upN6OiooHu5GVFxa89Hy/fkHzJPkhexG5tuA?= =?us-ascii?Q?QdEjw+6+9vgZVwPag3ZwQab664ULJMkSKeNiUoAgRf3yXX3XnaSF1sfxm/iJ?= =?us-ascii?Q?UZymU5X+HQ4p0egOpdFisGva0GcpFuiuR5ODOrrEPSIALkH/2pbnNgrjanv5?= =?us-ascii?Q?oaKuCJv/5ly3IXz9aUP7EGiesbLezUMkfC3+l89njHXTxYru1/jmeFU9OhP6?= =?us-ascii?Q?dub1LZO5bSN8vZpXgSVv/Xnyp17JPAaPrvAwvujEoT8XNZXBtLShCRXhU8aj?= =?us-ascii?Q?kukjms4Ei8pkz0lsQzoUdzB91BpS7iJTo8KuFpXRyENVi8SuRZc/+0UDyB9P?= =?us-ascii?Q?v+/Xms/hg45+2AWQe92lI0VIfuEZx82hUSF8mxWpbB1Qhh385rBFZHOVHlSt?= =?us-ascii?Q?x1rttnQkb6gIxp2uYUQg1AErP1AkV2IvZ7A1ilW6V19F/yy/geVUXoP+O8mF?= =?us-ascii?Q?R0WEvTuCQ9GIPUteXsbie5ydSM427pcE2Neg4i4Fz46u/WD5U3Nx3g3nYini?= =?us-ascii?Q?azRFkotnfNXyVvFZ4mSGc1DXizxwLxgVGqip8q1vSCABPm7DSClZ0mqkVEWb?= =?us-ascii?Q?POKJhPYitw6xO+DgF+d4nUad3nL5/QEFPUemF6deQCm7KEDUJpyFRYuBLp94?= =?us-ascii?Q?RySE/2/71t5pycTJ74ZMnmPmFpZcMsxn7Wvlz8pmlGq+UvIwS2M0S0jza0XF?= =?us-ascii?Q?XJrcpARCeWmlnvfdN7TgaugLP55/OYCuBRPD9U/8hAARIPsoi5YXvfJaNUNT?= =?us-ascii?Q?LA8+ax2q5ppo3/DFECgDoteAkUIOa+N5Hl9mON9nG/w73ZruH3DZmYJh0Ygf?= =?us-ascii?Q?xxuLxgTuR56wV+JA/ZMvWa7xTMEtLCLtew1g1SaadUTe5DyLBiboGUAvO3Op?= =?us-ascii?Q?CjIPm0=3D?= X-Microsoft-Exchange-Diagnostics: 1; DM3PR07MB2283; 6:jo+2hNHI4QVZbpt/Y3s7o9kM4KraUOcgxCkXJ9jGRHS+aHVt6Etjmz0TwJy18zHxBubQ0j7WpWB6/64gEYrWuVXue6DpfvTw7D7TqCgrvcY/oam80TUDwt2r9ZdOyqCUA15pcu+vhXZT93/0iRsB+f7FutRoCX4W4uXaZqNz18ECHMbaMVeup2xvcbnakQDF7CNk146p5DWKPyb6y32rTxtHfbOb8KK9Zi5owDyGj5o3dZtEl6Qo7MnhR4Eg1C5ClAlxoE6+yZXxVp05cU4tTwyTigNypxJ1pNbvffOuZ3ySrdPTsFc2KPnMkcVLS0obBTjJBzWqh+bZXz3rxFTYBkwPWap1uSV+/9JeGi2XFapPQCOop2TpmvI8zZadl/t31hxlb3Ta4pHbf6nlFtHL/x3BTbFNnrT46QLeN/C4tZZneAuNsByADSWP91FCN5opZpu0u9xLg+OzjJNhF9Rqmw==; 5:iAwafshXm6y92SrptiYnnxWIru560/QI8lrm+F7aC7shYZ0o3LJnEKMj6Hy0PpywnpFtqJzhsg+jJsmN9Mz0YPGMmg2ExXOyaQmK9SCrEdSP39D6yNWsjRqbdtVhInH2BCMCTx7A6kOBMAotJqMklA==; 24:dHU6NPtDVn3R0dSA2psMoo5Tno1m7m2S11Ao+NXSvvC1tmpiZsj6pcYTAeK8TgigjdTMoHwxGjdhR1AZJu2HbasjkQv8+SXbppgznw/+LYQ= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM3PR07MB2283; 7:fNed+NQAPiQyvUfLtyU+bBbkncd/Q/yfjr3ycekQUvMZBSQHRnYfCJaJ2yj0pCoxY5ezTbx8geyWTehW2GNIAbbbXR+wSslFPbAVbmABx7ZopCQaijkpo2uI2zVV04nULmPr249GVS70UW1M1k/kDzeZYnA6gBcvnspByw7ajsc5yj6x+D0oAebKfH1rN3OROtN50TR6w1Qsx9Xr+dRDqa9Rv+IWe3Dc+XwMDjo77yM0GJrtJKkdXPU2nqoGK6rL0KOr/s/ygFEk9xofV5qtZnM6GJCeMrQy+Vj5QoKekvntjzUIo1EpPUJjeXQYtM9suX5qSb0A0aWqy0eRkJk4nw== X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Apr 2017 07:20:20.2732 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM3PR07MB2283 Subject: [dpdk-dev] [PATCH v2 2/2] net/liquidio: fix null pointer check X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Apr 2017 07:20:23 -0000 Fix null pointer check in release Rx/Tx queue APIs. Reported by Coverity scan: 1423923 Dereference before null check 1423924 Dereference before null check Fixes: 9a30013b9884 ("net/liquidio: add API to release Rx queue") Fixes: cf6bfcbea178 ("net/liquidio: add API to release Tx queue") Signed-off-by: Shijith Thotton --- drivers/net/liquidio/lio_ethdev.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/drivers/net/liquidio/lio_ethdev.c b/drivers/net/liquidio/lio_ethdev.c index df91659..a65c749 100644 --- a/drivers/net/liquidio/lio_ethdev.c +++ b/drivers/net/liquidio/lio_ethdev.c @@ -1155,14 +1155,13 @@ struct rte_lio_xstats_name_off { lio_dev_rx_queue_release(void *rxq) { struct lio_droq *droq = rxq; - struct lio_device *lio_dev = droq->lio_dev; int oq_no; - /* Run time queue deletion not supported */ - if (lio_dev->port_configured) - return; + if (droq) { + /* Run time queue deletion not supported */ + if (droq->lio_dev->port_configured) + return; - if (droq != NULL) { oq_no = droq->q_no; lio_delete_droq_queue(droq->lio_dev, oq_no); } @@ -1250,14 +1249,14 @@ struct rte_lio_xstats_name_off { lio_dev_tx_queue_release(void *txq) { struct lio_instr_queue *tq = txq; - struct lio_device *lio_dev = tq->lio_dev; uint32_t fw_mapped_iq_no; - /* Run time queue deletion not supported */ - if (lio_dev->port_configured) - return; - if (tq != NULL) { + if (tq) { + /* Run time queue deletion not supported */ + if (tq->lio_dev->port_configured) + return; + /* Free sg_list */ lio_delete_sglist(tq); -- 1.8.3.1