Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1070224/?format=api
{ "id": 1070224, "url": "http://patchwork.ozlabs.org/api/patches/1070224/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20190329220840.51187-10-alice.michael@intel.com/", "project": { "id": 46, "url": "http://patchwork.ozlabs.org/api/projects/46/?format=api", "name": "Intel Wired Ethernet development", "link_name": "intel-wired-lan", "list_id": "intel-wired-lan.osuosl.org", "list_email": "intel-wired-lan@osuosl.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20190329220840.51187-10-alice.michael@intel.com>", "list_archive_url": null, "date": "2019-03-29T22:08:39", "name": "[next,S4,10/11] i40e: missing input validation on VF message handling by the PF", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "1d6ec29881b0b8dab7c573d0c66fd7a63747654c", "submitter": { "id": 71123, "url": "http://patchwork.ozlabs.org/api/people/71123/?format=api", "name": "Michael, Alice", "email": "alice.michael@intel.com" }, "delegate": { "id": 68, "url": "http://patchwork.ozlabs.org/api/users/68/?format=api", "username": "jtkirshe", "first_name": "Jeff", "last_name": "Kirsher", "email": "jeffrey.t.kirsher@intel.com" }, "mbox": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20190329220840.51187-10-alice.michael@intel.com/mbox/", "series": [ { "id": 100029, "url": "http://patchwork.ozlabs.org/api/series/100029/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=100029", "date": "2019-03-29T22:08:31", "name": "[next,S4,01/11] i40e: VF's promiscuous attribute is not kept", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/100029/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1070224/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1070224/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<intel-wired-lan-bounces@osuosl.org>", "X-Original-To": [ "incoming@patchwork.ozlabs.org", "intel-wired-lan@lists.osuosl.org" ], "Delivered-To": [ "patchwork-incoming@bilbo.ozlabs.org", "intel-wired-lan@lists.osuosl.org" ], "Authentication-Results": [ "ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=osuosl.org\n\t(client-ip=140.211.166.138; helo=whitealder.osuosl.org;\n\tenvelope-from=intel-wired-lan-bounces@osuosl.org;\n\treceiver=<UNKNOWN>)", "ozlabs.org;\n\tdmarc=fail (p=none dis=none) header.from=intel.com" ], "Received": [ "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 44WGCf0fwtz9sPZ\n\tfor <incoming@patchwork.ozlabs.org>;\n\tSat, 30 Mar 2019 09:11:09 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 7ABC985D5C;\n\tFri, 29 Mar 2019 22:11:08 +0000 (UTC)", "from whitealder.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id K90X26z93P+4; Fri, 29 Mar 2019 22:11:04 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 3DA2584C44;\n\tFri, 29 Mar 2019 22:11:03 +0000 (UTC)", "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ash.osuosl.org (Postfix) with ESMTP id 28AD61BF3DD\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 29 Mar 2019 22:10:30 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 265182E46D\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 29 Mar 2019 22:10:30 +0000 (UTC)", "from silver.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id ylTZCLOaV2y5 for <intel-wired-lan@lists.osuosl.org>;\n\tFri, 29 Mar 2019 22:10:28 +0000 (UTC)", "from mga04.intel.com (mga04.intel.com [192.55.52.120])\n\tby silver.osuosl.org (Postfix) with ESMTPS id A00662FCC5\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 29 Mar 2019 22:10:27 +0000 (UTC)", "from fmsmga001.fm.intel.com ([10.253.24.23])\n\tby fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t29 Mar 2019 15:10:26 -0700", "from alicemic-2.jf.intel.com ([10.166.16.121])\n\tby fmsmga001.fm.intel.com with ESMTP; 29 Mar 2019 15:10:26 -0700" ], "X-Virus-Scanned": [ "amavisd-new at osuosl.org", "amavisd-new at osuosl.org" ], "X-Greylist": "domain auto-whitelisted by SQLgrey-1.7.6", "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.60,286,1549958400\"; d=\"scan'208\";a=\"159698908\"", "From": "Alice Michael <alice.michael@intel.com>", "To": "alice.michael@intel.com,\n\tintel-wired-lan@lists.osuosl.org", "Date": "Fri, 29 Mar 2019 15:08:39 -0700", "Message-Id": "<20190329220840.51187-10-alice.michael@intel.com>", "X-Mailer": "git-send-email 2.19.2", "In-Reply-To": "<20190329220840.51187-1-alice.michael@intel.com>", "References": "<20190329220840.51187-1-alice.michael@intel.com>", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [next PATCH S4 10/11] i40e: missing input\n\tvalidation on VF message handling by the PF", "X-BeenThere": "intel-wired-lan@osuosl.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "Intel Wired Ethernet Linux Kernel Driver Development\n\t<intel-wired-lan.osuosl.org>", "List-Unsubscribe": "<https://lists.osuosl.org/mailman/options/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@osuosl.org?subject=unsubscribe>", "List-Archive": "<http://lists.osuosl.org/pipermail/intel-wired-lan/>", "List-Post": "<mailto:intel-wired-lan@osuosl.org>", "List-Help": "<mailto:intel-wired-lan-request@osuosl.org?subject=help>", "List-Subscribe": "<https://lists.osuosl.org/mailman/listinfo/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@osuosl.org?subject=subscribe>", "Cc": "Martyna Szapar <martyna.szapar@intel.com>", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "intel-wired-lan-bounces@osuosl.org", "Sender": "\"Intel-wired-lan\" <intel-wired-lan-bounces@osuosl.org>" }, "content": "From: Martyna Szapar <martyna.szapar@intel.com>\n\nPatch is adding missing input validation on VF message handling\nby the PF to the functions with opcodes:\n\tVIRTCHNL_OP_CONFIG_VSI_QUEUES = 6\n\tVIRTCHNL_OP_CONFIG_IRQ_MAP = 7,\n\tVIRTCHNL_OP_DISABLE_QUEUES = 9,\n\tVIRTCHNL_OP_CONFIG_PROMISCUOUS_MODE = 14,\n\nSigned-off-by: Martyna Szapar <martyna.szapar@intel.com>\n---\n .../ethernet/intel/i40e/i40e_virtchnl_pf.c | 58 ++++++++++++++-----\n .../ethernet/intel/i40e/i40e_virtchnl_pf.h | 2 +\n 2 files changed, 46 insertions(+), 14 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c\nindex d0e3677b7dc8..6a812eeaba8d 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c\n@@ -2014,6 +2014,16 @@ static int i40e_vc_config_promiscuous_mode_msg(struct i40e_vf *vf, u8 *msg)\n \t\tgoto err_out;\n \t}\n \n+\tif (info->flags > I40E_MAX_VF_PROMISC_FLAGS) {\n+\t\taq_ret = I40E_ERR_PARAM;\n+\t\tgoto err_out;\n+\t}\n+\n+\tif (!i40e_vc_isvalid_vsi_id(vf, info->vsi_id)) {\n+\t\taq_ret = I40E_ERR_PARAM;\n+\t\tgoto err_out;\n+\t}\n+\n \t/* Multicast promiscuous handling*/\n \tif (info->flags & FLAG_VF_MULTICAST_PROMISC)\n \t\tallmulti = true;\n@@ -2068,17 +2078,16 @@ static int i40e_vc_config_queues_msg(struct i40e_vf *vf, u8 *msg)\n \tstruct virtchnl_queue_pair_info *qpi;\n \tstruct i40e_pf *pf = vf->pf;\n \tu16 vsi_id, vsi_queue_id = 0;\n+\tu16 num_qps_all = 0;\n \ti40e_status aq_ret = 0;\n \tint i, j = 0, idx = 0;\n \n-\tvsi_id = qci->vsi_id;\n-\n \tif (!test_bit(I40E_VF_STATE_ACTIVE, &vf->vf_states)) {\n \t\taq_ret = I40E_ERR_PARAM;\n \t\tgoto error_param;\n \t}\n \n-\tif (!i40e_vc_isvalid_vsi_id(vf, vsi_id)) {\n+\tif (!i40e_vc_isvalid_vsi_id(vf, qci->vsi_id)) {\n \t\taq_ret = I40E_ERR_PARAM;\n \t\tgoto error_param;\n \t}\n@@ -2088,10 +2097,27 @@ static int i40e_vc_config_queues_msg(struct i40e_vf *vf, u8 *msg)\n \t\tgoto error_param;\n \t}\n \n+\tif (vf->adq_enabled) {\n+\t\tfor (i = 0; i < I40E_MAX_VF_VSI; i++)\n+\t\t\tnum_qps_all += vf->ch[i].num_qps;\n+\t\tif (num_qps_all != qci->num_queue_pairs) {\n+\t\t\taq_ret = I40E_ERR_PARAM;\n+\t\t\tgoto error_param;\n+\t\t}\n+\t}\n+\n+\tvsi_id = qci->vsi_id;\n+\n \tfor (i = 0; i < qci->num_queue_pairs; i++) {\n \t\tqpi = &qci->qpair[i];\n \n \t\tif (!vf->adq_enabled) {\n+\t\t\tif (!i40e_vc_isvalid_queue_id(vf, vsi_id,\n+\t\t\t\t\t\t qpi->txq.queue_id)) {\n+\t\t\t\taq_ret = I40E_ERR_PARAM;\n+\t\t\t\tgoto error_param;\n+\t\t\t}\n+\n \t\t\tvsi_queue_id = qpi->txq.queue_id;\n \n \t\t\tif (qpi->txq.vsi_id != qci->vsi_id ||\n@@ -2102,10 +2128,8 @@ static int i40e_vc_config_queues_msg(struct i40e_vf *vf, u8 *msg)\n \t\t\t}\n \t\t}\n \n-\t\tif (!i40e_vc_isvalid_queue_id(vf, vsi_id, vsi_queue_id)) {\n-\t\t\taq_ret = I40E_ERR_PARAM;\n-\t\t\tgoto error_param;\n-\t\t}\n+\t\tif (vf->adq_enabled)\n+\t\t\tvsi_id = vf->ch[idx].vsi_id;\n \n \t\tif (i40e_config_vsi_rx_queue(vf, vsi_id, vsi_queue_id,\n \t\t\t\t\t &qpi->rxq) ||\n@@ -2129,7 +2153,6 @@ static int i40e_vc_config_queues_msg(struct i40e_vf *vf, u8 *msg)\n \t\t\t\tj++;\n \t\t\t\tvsi_queue_id++;\n \t\t\t}\n-\t\t\tvsi_id = vf->ch[idx].vsi_id;\n \t\t}\n \t}\n \t/* set vsi num_queue_pairs in use to num configured by VF */\n@@ -2188,7 +2211,7 @@ static int i40e_vc_config_irq_map_msg(struct i40e_vf *vf, u8 *msg)\n \tstruct virtchnl_irq_map_info *irqmap_info =\n \t (struct virtchnl_irq_map_info *)msg;\n \tstruct virtchnl_vector_map *map;\n-\tu16 vsi_id, vector_id;\n+\tu16 vsi_id;\n \ti40e_status aq_ret = 0;\n \tint i;\n \n@@ -2197,16 +2220,21 @@ static int i40e_vc_config_irq_map_msg(struct i40e_vf *vf, u8 *msg)\n \t\tgoto error_param;\n \t}\n \n+\tif (irqmap_info->num_vectors >\n+\t vf->pf->hw.func_caps.num_msix_vectors_vf) {\n+\t\taq_ret = I40E_ERR_PARAM;\n+\t\tgoto error_param;\n+\t}\n+\n \tfor (i = 0; i < irqmap_info->num_vectors; i++) {\n \t\tmap = &irqmap_info->vecmap[i];\n-\t\tvector_id = map->vector_id;\n-\t\tvsi_id = map->vsi_id;\n \t\t/* validate msg params */\n-\t\tif (!i40e_vc_isvalid_vector_id(vf, vector_id) ||\n-\t\t !i40e_vc_isvalid_vsi_id(vf, vsi_id)) {\n+\t\tif (!i40e_vc_isvalid_vector_id(vf, map->vector_id) ||\n+\t\t !i40e_vc_isvalid_vsi_id(vf, map->vsi_id)) {\n \t\t\taq_ret = I40E_ERR_PARAM;\n \t\t\tgoto error_param;\n \t\t}\n+\t\tvsi_id = map->vsi_id;\n \n \t\tif (i40e_validate_queue_map(vf, vsi_id, map->rxq_map)) {\n \t\t\taq_ret = I40E_ERR_PARAM;\n@@ -2354,7 +2382,9 @@ static int i40e_vc_disable_queues_msg(struct i40e_vf *vf, u8 *msg)\n \t\tgoto error_param;\n \t}\n \n-\tif ((0 == vqs->rx_queues) && (0 == vqs->tx_queues)) {\n+\tif ((vqs->rx_queues == 0 && vqs->tx_queues == 0) ||\n+\t vqs->rx_queues > I40E_MAX_VF_QUEUES ||\n+\t vqs->tx_queues > I40E_MAX_VF_QUEUES) {\n \t\taq_ret = I40E_ERR_PARAM;\n \t\tgoto error_param;\n \t}\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h\nindex f9621026beef..f65cc0c16550 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h\n@@ -17,6 +17,8 @@\n #define I40E_VLAN_MASK\t\t\t0xFFF\n #define I40E_PRIORITY_MASK\t\t0xE000\n \n+#define I40E_MAX_VF_PROMISC_FLAGS\t3\n+\n /* Various queue ctrls */\n enum i40e_queue_ctrl {\n \tI40E_QUEUE_CTRL_UNKNOWN = 0,\n", "prefixes": [ "next", "S4", "10/11" ] }