Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/74937/?format=api
{ "id": 74937, "url": "http://patches.dpdk.org/api/patches/74937/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/2d36faa8a550dea466f87a9556db9f69c7cafe6b.1595936682.git.wangyunjian@huawei.com/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<2d36faa8a550dea466f87a9556db9f69c7cafe6b.1595936682.git.wangyunjian@huawei.com>", "list_archive_url": "https://inbox.dpdk.org/dev/2d36faa8a550dea466f87a9556db9f69c7cafe6b.1595936682.git.wangyunjian@huawei.com", "date": "2020-07-28T13:11:27", "name": "[2/2] net/ice: fix return value of null not checked", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "3165046611eb8543bd06ee14b91d9cac95a1f705", "submitter": { "id": 551, "url": "http://patches.dpdk.org/api/people/551/?format=api", "name": "Yunjian Wang", "email": "wangyunjian@huawei.com" }, "delegate": { "id": 1540, "url": "http://patches.dpdk.org/api/users/1540/?format=api", "username": "qzhan15", "first_name": "Qi", "last_name": "Zhang", "email": "qi.z.zhang@intel.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/2d36faa8a550dea466f87a9556db9f69c7cafe6b.1595936682.git.wangyunjian@huawei.com/mbox/", "series": [ { "id": 11360, "url": "http://patches.dpdk.org/api/series/11360/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=11360", "date": "2020-07-28T13:10:36", "name": "fixes for ice driver", "version": 1, "mbox": "http://patches.dpdk.org/series/11360/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/74937/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/74937/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from dpdk.org (dpdk.org [92.243.14.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id A9F21A052B;\n\tTue, 28 Jul 2020 15:11:43 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id E32AC1C044;\n\tTue, 28 Jul 2020 15:11:38 +0200 (CEST)", "from huawei.com (szxga06-in.huawei.com [45.249.212.32])\n by dpdk.org (Postfix) with ESMTP id 1539E1C029;\n Tue, 28 Jul 2020 15:11:38 +0200 (CEST)", "from DGGEMS414-HUB.china.huawei.com (unknown [172.30.72.59])\n by Forcepoint Email with ESMTP id 3F4805AB63E870D8C54B;\n Tue, 28 Jul 2020 21:11:37 +0800 (CST)", "from localhost (10.174.185.168) by DGGEMS414-HUB.china.huawei.com\n (10.3.19.214) with Microsoft SMTP Server id 14.3.487.0; Tue, 28 Jul 2020\n 21:11:29 +0800" ], "From": "wangyunjian <wangyunjian@huawei.com>", "To": "<dev@dpdk.org>", "CC": "<qiming.yang@intel.com>, <qi.z.zhang@intel.com>,\n <jerry.lilijun@huawei.com>, <xudingke@huawei.com>, Yunjian Wang\n <wangyunjian@huawei.com>, <stable@dpdk.org>", "Date": "Tue, 28 Jul 2020 21:11:27 +0800", "Message-ID": "\n <2d36faa8a550dea466f87a9556db9f69c7cafe6b.1595936682.git.wangyunjian@huawei.com>", "X-Mailer": "git-send-email 1.9.5.msysgit.1", "In-Reply-To": "<cover.1595936682.git.wangyunjian@huawei.com>", "References": "<cover.1595936682.git.wangyunjian@huawei.com>", "MIME-Version": "1.0", "Content-Type": "text/plain", "X-Originating-IP": "[10.174.185.168]", "X-CFilter-Loop": "Reflected", "Subject": "[dpdk-dev] [PATCH 2/2] net/ice: fix return value of null not checked", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "From: Yunjian Wang <wangyunjian@huawei.com>\n\nThe function rte_zmalloc() could return NULL, the return\nvalue need to be checked.\n\nFixes: 50370662b727 (\"net/ice: support device and queue ops\")\nCc: stable@dpdk.org\n\nSigned-off-by: Yunjian Wang <wangyunjian@huawei.com>\n---\n drivers/net/ice/ice_ethdev.c | 27 ++++++++++++++++++++++-----\n 1 file changed, 22 insertions(+), 5 deletions(-)", "diff": "diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c\nindex 5f3882826..643dfc6b5 100644\n--- a/drivers/net/ice/ice_ethdev.c\n+++ b/drivers/net/ice/ice_ethdev.c\n@@ -2623,13 +2623,24 @@ static int ice_init_rss(struct ice_pf *pf)\n \t\treturn 0;\n \t}\n \n-\tif (!vsi->rss_key)\n+\tif (!vsi->rss_key) {\n \t\tvsi->rss_key = rte_zmalloc(NULL,\n \t\t\t\t\t vsi->rss_key_size, 0);\n-\tif (!vsi->rss_lut)\n+\t\tif (vsi->rss_key == NULL) {\n+\t\t\tPMD_DRV_LOG(ERR, \"Failed to allocate memory for rss_key\");\n+\t\t\treturn -ENOMEM;\n+\t\t}\n+\t}\n+\tif (!vsi->rss_lut) {\n \t\tvsi->rss_lut = rte_zmalloc(NULL,\n \t\t\t\t\t vsi->rss_lut_size, 0);\n-\n+\t\tif (vsi->rss_lut == NULL) {\n+\t\t\tPMD_DRV_LOG(ERR, \"Failed to allocate memory for rss_key\");\n+\t\t\trte_free(vsi->rss_key);\n+\t\t\tvsi->rss_key = NULL;\n+\t\t\treturn -ENOMEM;\n+\t\t}\n+\t}\n \t/* configure RSS key */\n \tif (!rss_conf->rss_key) {\n \t\t/* Calculate the default hash key */\n@@ -2643,7 +2654,7 @@ static int ice_init_rss(struct ice_pf *pf)\n \trte_memcpy(key.standard_rss_key, vsi->rss_key, vsi->rss_key_size);\n \tret = ice_aq_set_rss_key(hw, vsi->idx, &key);\n \tif (ret)\n-\t\treturn -EINVAL;\n+\t\tgoto out;\n \n \t/* init RSS LUT table */\n \tfor (i = 0; i < vsi->rss_lut_size; i++)\n@@ -2653,7 +2664,7 @@ static int ice_init_rss(struct ice_pf *pf)\n \t\t\t\t ICE_AQC_GSET_RSS_LUT_TABLE_TYPE_PF,\n \t\t\t\t vsi->rss_lut, vsi->rss_lut_size);\n \tif (ret)\n-\t\treturn -EINVAL;\n+\t\tgoto out;\n \n \t/* Enable registers for symmetric_toeplitz function. */\n \treg = ICE_READ_REG(hw, VSIQF_HASH_CTL(vsi->vsi_id));\n@@ -2665,6 +2676,12 @@ static int ice_init_rss(struct ice_pf *pf)\n \tice_rss_hash_set(pf, rss_conf->rss_hf);\n \n \treturn 0;\n+out:\n+\trte_free(vsi->rss_key);\n+\tvsi->rss_key = NULL;\n+\trte_free(vsi->rss_lut);\n+\tvsi->rss_lut = NULL;\n+\treturn -EINVAL;\n }\n \n static int\n", "prefixes": [ "2/2" ] }