Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/44485/?format=api
{ "id": 44485, "url": "http://patches.dpdk.org/api/patches/44485/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1536572016-18134-22-git-send-email-arybchenko@solarflare.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": "<1536572016-18134-22-git-send-email-arybchenko@solarflare.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1536572016-18134-22-git-send-email-arybchenko@solarflare.com", "date": "2018-09-10T09:33:20", "name": "[21/37] net/sfc/base: avoid usage of too big arrays on stack", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "4dc1fe5000e60e709da5c68d2905d4fb727a14d4", "submitter": { "id": 607, "url": "http://patches.dpdk.org/api/people/607/?format=api", "name": "Andrew Rybchenko", "email": "arybchenko@solarflare.com" }, "delegate": { "id": 319, "url": "http://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/1536572016-18134-22-git-send-email-arybchenko@solarflare.com/mbox/", "series": [ { "id": 1244, "url": "http://patches.dpdk.org/api/series/1244/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=1244", "date": "2018-09-10T09:33:01", "name": "net/sfc: update base driver", "version": 1, "mbox": "http://patches.dpdk.org/series/1244/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/44485/comments/", "check": "warning", "checks": "http://patches.dpdk.org/api/patches/44485/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id F159C5F45;\n\tMon, 10 Sep 2018 11:34:24 +0200 (CEST)", "from dispatch1-us1.ppe-hosted.com (dispatch1-us1.ppe-hosted.com\n\t[67.231.154.164]) by dpdk.org (Postfix) with ESMTP id B95E54C93;\n\tMon, 10 Sep 2018 11:33:52 +0200 (CEST)", "from webmail.solarflare.com (webmail.solarflare.com\n\t[12.187.104.26])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby mx1-us1.ppe-hosted.com (Proofpoint Essentials ESMTP Server) with\n\tESMTPS id DBC26780055; Mon, 10 Sep 2018 09:33:51 +0000 (UTC)", "from ocex03.SolarFlarecom.com (10.20.40.36) by\n\tocex03.SolarFlarecom.com (10.20.40.36) with Microsoft SMTP Server\n\t(TLS) id 15.0.1395.4; Mon, 10 Sep 2018 02:33:48 -0700", "from opal.uk.solarflarecom.com (10.17.10.1) by\n\tocex03.SolarFlarecom.com (10.20.40.36) with Microsoft SMTP Server\n\t(TLS) id\n\t15.0.1395.4 via Frontend Transport; Mon, 10 Sep 2018 02:33:47 -0700", "from ukv-loginhost.uk.solarflarecom.com\n\t(ukv-loginhost.uk.solarflarecom.com [10.17.10.39])\n\tby opal.uk.solarflarecom.com (8.13.8/8.13.8) with ESMTP id\n\tw8A9Xkeb023830; Mon, 10 Sep 2018 10:33:46 +0100", "from ukv-loginhost.uk.solarflarecom.com (localhost [127.0.0.1])\n\tby ukv-loginhost.uk.solarflarecom.com (Postfix) with ESMTP id\n\t41B7F1626D2; Mon, 10 Sep 2018 10:33:46 +0100 (BST)" ], "X-Virus-Scanned": "Proofpoint Essentials engine", "From": "Andrew Rybchenko <arybchenko@solarflare.com>", "To": "<dev@dpdk.org>", "CC": "Martin Harvey <mharvey@solarflare.com>, <stable@dpdk.org>", "Date": "Mon, 10 Sep 2018 10:33:20 +0100", "Message-ID": "<1536572016-18134-22-git-send-email-arybchenko@solarflare.com>", "X-Mailer": "git-send-email 1.8.3.1", "In-Reply-To": "<1536572016-18134-1-git-send-email-arybchenko@solarflare.com>", "References": "<1536572016-18134-1-git-send-email-arybchenko@solarflare.com>", "MIME-Version": "1.0", "Content-Type": "text/plain", "X-TM-AS-Product-Ver": "SMEX-12.5.0.1300-8.5.1010-24084.005", "X-TM-AS-Result": "No-3.054800-4.000000-10", "X-TMASE-MatchedRID": "KZL/HywDPYQ6d8weoeLiafVFR4sC8dPySjyMfjCRfaPfUZT83lbkEGwb\n\teb04PSV44lGx6/foxGCATkBnmBBZvjFmWZmMuV5m3fn7n/ZHGqaWHGENdT+VP57oC1rVz/uNo8W\n\tMkQWv6iXBcIE78YqRWo6HM5rqDwqtRQB46AXOCdLmx94sR56dC9xVLz85I7B0TwZqs0n+TmE2nl\n\t75kX61DqltkZaU7aNK4a23t5/PkTGWkXvdfncHqkMpbgDSvEVRhdeYev6ImzWyrFieOBrhBjzcW\n\trt/fwYrRcB2ZpPnVjJuI9MGG9suFpRMZUCEHkRt", "X-TM-AS-User-Approved-Sender": "No", "X-TM-AS-User-Blocked-Sender": "No", "X-TMASE-Result": "10--3.054800-4.000000", "X-TMASE-Version": "SMEX-12.5.0.1300-8.5.1010-24084.005", "X-MDID": "1536572032-dD6CC8ldkj3M", "Subject": "[dpdk-dev] [PATCH 21/37] net/sfc/base: avoid usage of too big\n\tarrays on stack", "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\t<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\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "From: Martin Harvey <mharvey@solarflare.com>\n\nFound by PreFAST static analysis.\n\nFixes: 1dae25112a54 (\"net/sfc/base: import built-in selftest\")\nFixes: d96a34d165b1 (\"net/sfc/base: import NVRAM support\")\nCc: stable@dpdk.org\n\nSigned-off-by: Martin Harvey <mharvey@solarflare.com>\nSigned-off-by: Andrew Rybchenko <arybchenko@solarflare.com>\n---\n drivers/net/sfc/base/ef10_phy.c | 18 +++++++++++++++---\n drivers/net/sfc/base/efx_nvram.c | 27 ++++++++++++++++++---------\n 2 files changed, 33 insertions(+), 12 deletions(-)", "diff": "diff --git a/drivers/net/sfc/base/ef10_phy.c b/drivers/net/sfc/base/ef10_phy.c\nindex 84acb70a1..e9c7b40e4 100644\n--- a/drivers/net/sfc/base/ef10_phy.c\n+++ b/drivers/net/sfc/base/ef10_phy.c\n@@ -583,14 +583,26 @@ ef10_bist_poll(\n \tunsigned long *valuesp,\n \t__in\t\t\tsize_t count)\n {\n+\t/*\n+\t * MCDI_CTL_SDU_LEN_MAX_V1 is large enough cover all BIST results,\n+\t * whilst not wasting stack.\n+\t */\n+\tuint8_t payload[MAX(MC_CMD_POLL_BIST_IN_LEN, MCDI_CTL_SDU_LEN_MAX_V1)];\n \tefx_nic_cfg_t *encp = &(enp->en_nic_cfg);\n \tefx_mcdi_req_t req;\n-\tuint8_t payload[MAX(MC_CMD_POLL_BIST_IN_LEN,\n-\t\t\t MCDI_CTL_SDU_LEN_MAX)];\n \tuint32_t value_mask = 0;\n \tuint32_t result;\n \tefx_rc_t rc;\n \n+\tEFX_STATIC_ASSERT(MC_CMD_POLL_BIST_OUT_LEN <=\n+\t MCDI_CTL_SDU_LEN_MAX_V1);\n+\tEFX_STATIC_ASSERT(MC_CMD_POLL_BIST_OUT_SFT9001_LEN <=\n+\t MCDI_CTL_SDU_LEN_MAX_V1);\n+\tEFX_STATIC_ASSERT(MC_CMD_POLL_BIST_OUT_MRSFP_LEN <=\n+\t MCDI_CTL_SDU_LEN_MAX_V1);\n+\tEFX_STATIC_ASSERT(MC_CMD_POLL_BIST_OUT_MEM_LEN <=\n+\t MCDI_CTL_SDU_LEN_MAX_V1);\n+\n \t_NOTE(ARGUNUSED(type))\n \n \t(void) memset(payload, 0, sizeof (payload));\n@@ -598,7 +610,7 @@ ef10_bist_poll(\n \treq.emr_in_buf = payload;\n \treq.emr_in_length = MC_CMD_POLL_BIST_IN_LEN;\n \treq.emr_out_buf = payload;\n-\treq.emr_out_length = MCDI_CTL_SDU_LEN_MAX;\n+\treq.emr_out_length = MCDI_CTL_SDU_LEN_MAX_V1;\n \n \tefx_mcdi_execute(enp, &req);\n \ndiff --git a/drivers/net/sfc/base/efx_nvram.c b/drivers/net/sfc/base/efx_nvram.c\nindex 9000fe886..d7b1a6778 100644\n--- a/drivers/net/sfc/base/efx_nvram.c\n+++ b/drivers/net/sfc/base/efx_nvram.c\n@@ -869,23 +869,27 @@ efx_mcdi_nvram_write(\n \t__in\t\t\tsize_t size)\n {\n \tefx_mcdi_req_t req;\n-\tuint8_t payload[MAX(MCDI_CTL_SDU_LEN_MAX_V1,\n-\t\t\t MCDI_CTL_SDU_LEN_MAX_V2)];\n+\tuint8_t *payload;\n \tefx_rc_t rc;\n \tsize_t max_data_size;\n+\tsize_t payload_len = enp->en_nic_cfg.enc_mcdi_max_payload_length;\n \n-\tmax_data_size = enp->en_nic_cfg.enc_mcdi_max_payload_length\n-\t - MC_CMD_NVRAM_WRITE_IN_LEN(0);\n-\tEFSYS_ASSERT3U(enp->en_nic_cfg.enc_mcdi_max_payload_length, >, 0);\n-\tEFSYS_ASSERT3U(max_data_size, <,\n-\t\t enp->en_nic_cfg.enc_mcdi_max_payload_length);\n+\tmax_data_size = payload_len - MC_CMD_NVRAM_WRITE_IN_LEN(0);\n+\tEFSYS_ASSERT3U(payload_len, >, 0);\n+\tEFSYS_ASSERT3U(max_data_size, <, payload_len);\n \n \tif (size > max_data_size) {\n \t\trc = EINVAL;\n \t\tgoto fail1;\n \t}\n \n-\t(void) memset(payload, 0, sizeof (payload));\n+\tEFSYS_KMEM_ALLOC(enp->en_esip, payload_len, payload);\n+\tif (payload == NULL) {\n+\t\trc = ENOMEM;\n+\t\tgoto fail2;\n+\t}\n+\n+\t(void) memset(payload, 0, payload_len);\n \treq.emr_cmd = MC_CMD_NVRAM_WRITE;\n \treq.emr_in_buf = payload;\n \treq.emr_in_length = MC_CMD_NVRAM_WRITE_IN_LEN(size);\n@@ -903,11 +907,16 @@ efx_mcdi_nvram_write(\n \n \tif (req.emr_rc != 0) {\n \t\trc = req.emr_rc;\n-\t\tgoto fail2;\n+\t\tgoto fail3;\n \t}\n \n+\tEFSYS_KMEM_FREE(enp->en_esip, payload_len, payload);\n+\n \treturn (0);\n \n+fail3:\n+\tEFSYS_PROBE(fail3);\n+\tEFSYS_KMEM_FREE(enp->en_esip, payload_len, payload);\n fail2:\n \tEFSYS_PROBE(fail2);\n fail1:\n", "prefixes": [ "21/37" ] }