Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1137053/?format=api
{ "id": 1137053, "url": "http://patchwork.ozlabs.org/api/patches/1137053/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20190725095401.24590-10-anthony.l.nguyen@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": "<20190725095401.24590-10-anthony.l.nguyen@intel.com>", "list_archive_url": null, "date": "2019-07-25T09:53:59", "name": "[S25,10/12] ice: add validation in OP_CONFIG_VSI_QUEUES VF message", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "d6b7a6ffe7b5faf7a64abd4f0dd43cbffbc3b751", "submitter": { "id": 68875, "url": "http://patchwork.ozlabs.org/api/people/68875/?format=api", "name": "Tony Nguyen", "email": "anthony.l.nguyen@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/20190725095401.24590-10-anthony.l.nguyen@intel.com/mbox/", "series": [ { "id": 121514, "url": "http://patchwork.ozlabs.org/api/series/121514/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=121514", "date": "2019-07-25T09:53:50", "name": "[S25,01/12] ice: update ethtool stats on-demand", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/121514/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1137053/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1137053/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.133; helo=hemlock.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 hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\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 45vgYF1HZnz9sBt\n\tfor <incoming@patchwork.ozlabs.org>;\n\tFri, 26 Jul 2019 04:22:24 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id E4D78881AB;\n\tThu, 25 Jul 2019 18:22:22 +0000 (UTC)", "from hemlock.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id m13B9e-SIcxX; Thu, 25 Jul 2019 18:22:22 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 3C5A488157;\n\tThu, 25 Jul 2019 18:22:22 +0000 (UTC)", "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\tby ash.osuosl.org (Postfix) with ESMTP id 81A251BF988\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 25 Jul 2019 18:22:19 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 7FA3B86582\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 25 Jul 2019 18:22:19 +0000 (UTC)", "from fraxinus.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id OLsjClMuIMrG for <intel-wired-lan@lists.osuosl.org>;\n\tThu, 25 Jul 2019 18:22:19 +0000 (UTC)", "from mga01.intel.com (mga01.intel.com [192.55.52.88])\n\tby fraxinus.osuosl.org (Postfix) with ESMTPS id B021A865A5\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 25 Jul 2019 18:22:18 +0000 (UTC)", "from fmsmga004.fm.intel.com ([10.253.24.48])\n\tby fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t25 Jul 2019 11:22:18 -0700", "from unknown (HELO localhost.jf.intel.com) ([10.166.244.174])\n\tby fmsmga004.fm.intel.com with ESMTP; 25 Jul 2019 11:22:18 -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.64,307,1559545200\"; d=\"scan'208\";a=\"193897622\"", "From": "Tony Nguyen <anthony.l.nguyen@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Thu, 25 Jul 2019 02:53:59 -0700", "Message-Id": "<20190725095401.24590-10-anthony.l.nguyen@intel.com>", "X-Mailer": "git-send-email 2.20.1", "In-Reply-To": "<20190725095401.24590-1-anthony.l.nguyen@intel.com>", "References": "<20190725095401.24590-1-anthony.l.nguyen@intel.com>", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [PATCH S25 10/12] ice: add validation in\n\tOP_CONFIG_VSI_QUEUES VF message", "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>", "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: Michal Swiatkowski <michal.swiatkowski@intel.com>\n\nCheck num_queue_pairs to avoid access to unallocated field of\nvsi->tx_rings/vsi->rx_rings. Without this validation we can set\nvsi->alloc_txq/vsi->alloc_rxq to value smaller than ICE_MAX_BASE_QS_PER_VF\nand send this command with num_queue_pairs greater than\nvsi->alloc_txq/vsi->alloc_rxq. This lead to access to unallocated memory.\n\nIn VF vsi alloc_txq and alloc_rxq should be the same. Get minimum\nbecause looks more readable.\n\nAlso add validation for ring_len param. It should be greater than 32 and\nbe multiple of 32. Incorrect value leads to hang traffic on PF.\n\nSigned-off-by: Michal Swiatkowski <michal.swiatkowski@intel.com>\n---\n .../net/ethernet/intel/ice/ice_virtchnl_pf.c | 31 ++++++++++++++-----\n 1 file changed, 24 insertions(+), 7 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c\nindex 377e6d495c14..cd8662ac133d 100644\n--- a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c\n+++ b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c\n@@ -1713,6 +1713,19 @@ static bool ice_vc_isvalid_q_id(struct ice_vf *vf, u16 vsi_id, u8 qid)\n \treturn (vsi && (qid < vsi->alloc_txq));\n }\n \n+/**\n+ * ice_vc_isvalid_ring_len\n+ * @ring_len: length of ring\n+ *\n+ * check for the valid ring count, should be multiple of ICE_REQ_DESC_MULTIPLE\n+ */\n+static bool ice_vc_isvalid_ring_len(u16 ring_len)\n+{\n+\treturn (ring_len >= ICE_MIN_NUM_DESC &&\n+\t\tring_len <= ICE_MAX_NUM_DESC &&\n+\t\t!(ring_len % ICE_REQ_DESC_MULTIPLE));\n+}\n+\n /**\n * ice_vc_config_rss_key\n * @vf: pointer to the VF info\n@@ -2108,16 +2121,17 @@ static int ice_vc_cfg_qs_msg(struct ice_vf *vf, u8 *msg)\n \t\tgoto error_param;\n \t}\n \n-\tif (qci->num_queue_pairs > ICE_MAX_BASE_QS_PER_VF) {\n-\t\tdev_err(&pf->pdev->dev,\n-\t\t\t\"VF-%d requesting more than supported number of queues: %d\\n\",\n-\t\t\tvf->vf_id, qci->num_queue_pairs);\n+\tvsi = pf->vsi[vf->lan_vsi_idx];\n+\tif (!vsi) {\n \t\tv_ret = VIRTCHNL_STATUS_ERR_PARAM;\n \t\tgoto error_param;\n \t}\n \n-\tvsi = pf->vsi[vf->lan_vsi_idx];\n-\tif (!vsi) {\n+\tif (qci->num_queue_pairs > ICE_MAX_BASE_QS_PER_VF ||\n+\t qci->num_queue_pairs > min_t(u16, vsi->alloc_txq, vsi->alloc_rxq)) {\n+\t\tdev_err(&pf->pdev->dev,\n+\t\t\t\"VF-%d requesting more than supported number of queues: %d\\n\",\n+\t\t\tvf->vf_id, min_t(u16, vsi->alloc_txq, vsi->alloc_rxq));\n \t\tv_ret = VIRTCHNL_STATUS_ERR_PARAM;\n \t\tgoto error_param;\n \t}\n@@ -2128,6 +2142,8 @@ static int ice_vc_cfg_qs_msg(struct ice_vf *vf, u8 *msg)\n \t\t qpi->rxq.vsi_id != qci->vsi_id ||\n \t\t qpi->rxq.queue_id != qpi->txq.queue_id ||\n \t\t qpi->txq.headwb_enabled ||\n+\t\t !ice_vc_isvalid_ring_len(qpi->txq.ring_len) ||\n+\t\t !ice_vc_isvalid_ring_len(qpi->rxq.ring_len) ||\n \t\t !ice_vc_isvalid_q_id(vf, qci->vsi_id, qpi->txq.queue_id)) {\n \t\t\tv_ret = VIRTCHNL_STATUS_ERR_PARAM;\n \t\t\tgoto error_param;\n@@ -2138,7 +2154,8 @@ static int ice_vc_cfg_qs_msg(struct ice_vf *vf, u8 *msg)\n \t\t/* copy Rx queue info from VF into VSI */\n \t\tvsi->rx_rings[i]->dma = qpi->rxq.dma_ring_addr;\n \t\tvsi->rx_rings[i]->count = qpi->rxq.ring_len;\n-\t\tif (qpi->rxq.databuffer_size > ((16 * 1024) - 128)) {\n+\t\tif (qpi->rxq.databuffer_size > ((16 * 1024) - 128) ||\n+\t\t qpi->rxq.databuffer_size < 1024) {\n \t\t\tv_ret = VIRTCHNL_STATUS_ERR_PARAM;\n \t\t\tgoto error_param;\n \t\t}\n", "prefixes": [ "S25", "10/12" ] }