Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/955596/?format=api
{ "id": 955596, "url": "http://patchwork.ozlabs.org/api/patches/955596/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20180809132903.22819-11-anirudh.venkataramanan@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": "<20180809132903.22819-11-anirudh.venkataramanan@intel.com>", "list_archive_url": null, "date": "2018-08-09T13:29:00", "name": "[v4,10/13] ice: Fix a few null pointer dereference issues", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "eb9284df6e7a0fbd7f17cee260f9a74646708f12", "submitter": { "id": 73601, "url": "http://patchwork.ozlabs.org/api/people/73601/?format=api", "name": "Anirudh Venkataramanan", "email": "anirudh.venkataramanan@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/20180809132903.22819-11-anirudh.venkataramanan@intel.com/mbox/", "series": [ { "id": 60077, "url": "http://patchwork.ozlabs.org/api/series/60077/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=60077", "date": "2018-08-09T13:28:50", "name": "Bug fixes for ice", "version": 4, "mbox": "http://patchwork.ozlabs.org/series/60077/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/955596/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/955596/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.136; helo=silver.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 silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 41mTcw0xrtz9s4c\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 9 Aug 2018 23:29:36 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id A7802220E2;\n\tThu, 9 Aug 2018 13:29:34 +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 SLHO2w1S0TWX; Thu, 9 Aug 2018 13:29:32 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby silver.osuosl.org (Postfix) with ESMTP id 04ECA2943C;\n\tThu, 9 Aug 2018 13:29:31 +0000 (UTC)", "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ash.osuosl.org (Postfix) with ESMTP id BC9AB1C3F93\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 9 Aug 2018 13:29:28 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id BA83B29439\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 9 Aug 2018 13:29:28 +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 GyAm8aJklWVD for <intel-wired-lan@lists.osuosl.org>;\n\tThu, 9 Aug 2018 13:29:28 +0000 (UTC)", "from mga14.intel.com (mga14.intel.com [192.55.52.115])\n\tby silver.osuosl.org (Postfix) with ESMTPS id 4FD3E29436\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 9 Aug 2018 13:29:28 +0000 (UTC)", "from orsmga004.jf.intel.com ([10.7.209.38])\n\tby fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t09 Aug 2018 06:29:28 -0700", "from kyungmin-mobl.amr.corp.intel.com (HELO\n\tavenkata-mobl4.localdomain) ([10.254.101.153])\n\tby orsmga004.jf.intel.com with ESMTP; 09 Aug 2018 06:29:27 -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.53,215,1531810800\"; d=\"scan'208\";a=\"223273574\"", "From": "Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Thu, 9 Aug 2018 06:29:00 -0700", "Message-Id": "<20180809132903.22819-11-anirudh.venkataramanan@intel.com>", "X-Mailer": "git-send-email 2.17.1", "In-Reply-To": "<20180809132903.22819-1-anirudh.venkataramanan@intel.com>", "References": "<20180809132903.22819-1-anirudh.venkataramanan@intel.com>", "Subject": "[Intel-wired-lan] [PATCH v4 10/13] ice: Fix a few null pointer\n\tdereference issues", "X-BeenThere": "intel-wired-lan@osuosl.org", "X-Mailman-Version": "2.1.24", "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>", "MIME-Version": "1.0", "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": "1) When ice_ena_msix_range() fails to reserve vectors, a devm_kfree()\n warning was seen in the error flow path. So check pf->irq_tracker\n before use in ice_clear_interrupt_scheme().\n\n2) In ice_vsi_cfg(), check vsi->netdev before use.\n\n3) In ice_get_link_status, check link_up before use.\n\nSigned-off-by: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>\n---\n drivers/net/ethernet/intel/ice/ice_common.c | 2 +-\n drivers/net/ethernet/intel/ice/ice_main.c | 17 ++++++++++-------\n 2 files changed, 11 insertions(+), 8 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/ice/ice_common.c b/drivers/net/ethernet/intel/ice/ice_common.c\nindex d5300b606d5a..ebd701ac9428 100644\n--- a/drivers/net/ethernet/intel/ice/ice_common.c\n+++ b/drivers/net/ethernet/intel/ice/ice_common.c\n@@ -1483,7 +1483,7 @@ enum ice_status ice_get_link_status(struct ice_port_info *pi, bool *link_up)\n \tstruct ice_phy_info *phy_info;\n \tenum ice_status status = 0;\n \n-\tif (!pi)\n+\tif (!pi || !link_up)\n \t\treturn ICE_ERR_PARAM;\n \n \tphy_info = &pi->phy;\ndiff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c\nindex 34be94a30a60..d5d83c8848f8 100644\n--- a/drivers/net/ethernet/intel/ice/ice_main.c\n+++ b/drivers/net/ethernet/intel/ice/ice_main.c\n@@ -3257,8 +3257,10 @@ static void ice_clear_interrupt_scheme(struct ice_pf *pf)\n \tif (test_bit(ICE_FLAG_MSIX_ENA, pf->flags))\n \t\tice_dis_msix(pf);\n \n-\tdevm_kfree(&pf->pdev->dev, pf->irq_tracker);\n-\tpf->irq_tracker = NULL;\n+\tif (pf->irq_tracker) {\n+\t\tdevm_kfree(&pf->pdev->dev, pf->irq_tracker);\n+\t\tpf->irq_tracker = NULL;\n+\t}\n }\n \n /**\n@@ -4112,11 +4114,12 @@ static int ice_vsi_cfg(struct ice_vsi *vsi)\n {\n \tint err;\n \n-\tice_set_rx_mode(vsi->netdev);\n-\n-\terr = ice_restore_vlan(vsi);\n-\tif (err)\n-\t\treturn err;\n+\tif (vsi->netdev) {\n+\t\tice_set_rx_mode(vsi->netdev);\n+\t\terr = ice_restore_vlan(vsi);\n+\t\tif (err)\n+\t\t\treturn err;\n+\t}\n \n \terr = ice_vsi_cfg_txqs(vsi);\n \tif (!err)\n", "prefixes": [ "v4", "10/13" ] }