Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1020565/?format=api
{ "id": 1020565, "url": "http://patchwork.ozlabs.org/api/patches/1020565/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20190104011703.11365-1-jeffrey.t.kirsher@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": "<20190104011703.11365-1-jeffrey.t.kirsher@intel.com>", "list_archive_url": null, "date": "2019-01-04T01:17:03", "name": "[v2] e1000e: fix a missing check for return value", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "1665cc6cef1bc56556acc89ef34fcb620ef37996", "submitter": { "id": 473, "url": "http://patchwork.ozlabs.org/api/people/473/?format=api", "name": "Kirsher, Jeffrey T", "email": "jeffrey.t.kirsher@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/20190104011703.11365-1-jeffrey.t.kirsher@intel.com/mbox/", "series": [ { "id": 84373, "url": "http://patchwork.ozlabs.org/api/series/84373/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=84373", "date": "2019-01-04T01:17:03", "name": "[v2] e1000e: fix a missing check for return value", "version": 2, "mbox": "http://patchwork.ozlabs.org/series/84373/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1020565/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1020565/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.137; helo=fraxinus.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 fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\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 43W6Mb2XS5z9s7T\n\tfor <incoming@patchwork.ozlabs.org>;\n\tFri, 4 Jan 2019 12:17:15 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 76B0985C47;\n\tFri, 4 Jan 2019 01:17:13 +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 EVkclWcHWuPs; Fri, 4 Jan 2019 01:17:11 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id B28E985C37;\n\tFri, 4 Jan 2019 01:17:11 +0000 (UTC)", "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ash.osuosl.org (Postfix) with ESMTP id C7ABC1C32AF\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 4 Jan 2019 01:17:10 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id C44C186294\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 4 Jan 2019 01:17:10 +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 dFUjiFIM685p for <intel-wired-lan@lists.osuosl.org>;\n\tFri, 4 Jan 2019 01:17:09 +0000 (UTC)", "from mga07.intel.com (mga07.intel.com [134.134.136.100])\n\tby whitealder.osuosl.org (Postfix) with ESMTPS id D3E1D86261\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 4 Jan 2019 01:17:09 +0000 (UTC)", "from orsmga006.jf.intel.com ([10.7.209.51])\n\tby orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t03 Jan 2019 17:17:09 -0800", "from jtkirshe-desk1.jf.intel.com ([134.134.177.96])\n\tby orsmga006.jf.intel.com with ESMTP; 03 Jan 2019 17:17:09 -0800" ], "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.56,437,1539673200\"; d=\"scan'208\";a=\"105372276\"", "From": "Jeff Kirsher <jeffrey.t.kirsher@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Thu, 3 Jan 2019 17:17:03 -0800", "Message-Id": "<20190104011703.11365-1-jeffrey.t.kirsher@intel.com>", "X-Mailer": "git-send-email 2.20.1", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [PATCH v2] e1000e: fix a missing check for return\n\tvalue", "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": "Kangjie Lu <kjlu@umn.edu>", "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": "The change is based on the issue found by Kangjie Lu <kjlu@umn.edu> where\nwe not checking the return value of a register read/write which could result\nin a NULL pointer dereference if the read/write fails.\n\nSince we are only trying to disable the far-end loopback, if the read\nand write of register fails, we do not want to bail out of the function.\nWe just want to log that it failed to disable and continue on.\n\nCC: Sasha Neftin <sasha.neftin@intel.com>\nCC: Kangjie Lu <kjlu@umn.edu>\nSigned-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>\n---\nv2: fixed a compilation error due to me fat fingering missing braces.\n\n .../net/ethernet/intel/e1000e/80003es2lan.c | 33 +++++++++++++------\n 1 file changed, 23 insertions(+), 10 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/e1000e/80003es2lan.c b/drivers/net/ethernet/intel/e1000e/80003es2lan.c\nindex 257bd59bc9c6..f86d55657959 100644\n--- a/drivers/net/ethernet/intel/e1000e/80003es2lan.c\n+++ b/drivers/net/ethernet/intel/e1000e/80003es2lan.c\n@@ -696,11 +696,16 @@ static s32 e1000_reset_hw_80003es2lan(struct e1000_hw *hw)\n \tret_val =\n \t e1000_read_kmrn_reg_80003es2lan(hw, E1000_KMRNCTRLSTA_INBAND_PARAM,\n \t\t\t\t\t &kum_reg_data);\n-\tif (ret_val)\n-\t\treturn ret_val;\n-\tkum_reg_data |= E1000_KMRNCTRLSTA_IBIST_DISABLE;\n-\te1000_write_kmrn_reg_80003es2lan(hw, E1000_KMRNCTRLSTA_INBAND_PARAM,\n-\t\t\t\t\t kum_reg_data);\n+\tif (!ret_val) {\n+\t\tkum_reg_data |= E1000_KMRNCTRLSTA_IBIST_DISABLE;\n+\t\tret_val = e1000_write_kmrn_reg_80003es2lan(hw,\n+\t\t\t\t\t\t E1000_KMRNCTRLSTA_INBAND_PARAM,\n+\t\t\t\t\t\t kum_reg_data);\n+\t\tif (ret_val)\n+\t\t\te_dbg(\"Error disabling far-end loopback\\n\");\n+\t} else {\n+\t\te_dbg(\"Error disabling far-end loopback\\n\");\n+\t}\n \n \tret_val = e1000e_get_auto_rd_done(hw);\n \tif (ret_val)\n@@ -754,11 +759,19 @@ static s32 e1000_init_hw_80003es2lan(struct e1000_hw *hw)\n \t\treturn ret_val;\n \n \t/* Disable IBIST slave mode (far-end loopback) */\n-\te1000_read_kmrn_reg_80003es2lan(hw, E1000_KMRNCTRLSTA_INBAND_PARAM,\n-\t\t\t\t\t&kum_reg_data);\n-\tkum_reg_data |= E1000_KMRNCTRLSTA_IBIST_DISABLE;\n-\te1000_write_kmrn_reg_80003es2lan(hw, E1000_KMRNCTRLSTA_INBAND_PARAM,\n-\t\t\t\t\t kum_reg_data);\n+\tret_val =\n+\t e1000_read_kmrn_reg_80003es2lan(hw, E1000_KMRNCTRLSTA_INBAND_PARAM,\n+\t\t\t\t\t &kum_reg_data);\n+\tif (!ret_val) {\n+\t\tkum_reg_data |= E1000_KMRNCTRLSTA_IBIST_DISABLE;\n+\t\tret_val = e1000_write_kmrn_reg_80003es2lan(hw,\n+\t\t\t\t\t\t E1000_KMRNCTRLSTA_INBAND_PARAM,\n+\t\t\t\t\t\t kum_reg_data);\n+\t\tif (ret_val)\n+\t\t\te_dbg(\"Error disabling far-end loopback\\n\");\n+\t} else {\n+\t\te_dbg(\"Error disabling far-end loopback\\n\");\n+\t}\n \n \t/* Set the transmit descriptor write-back policy */\n \treg_data = er32(TXDCTL(0));\n", "prefixes": [ "v2" ] }