Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/630069/?format=api
{ "id": 630069, "url": "http://patchwork.ozlabs.org/api/patches/630069/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20160603224228.10192-3-jacob.e.keller@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": "<20160603224228.10192-3-jacob.e.keller@intel.com>", "list_archive_url": null, "date": "2016-06-03T22:42:12", "name": "[v1,02/18] fm10k: avoid possible null pointer dereference in fm10k_update_stats", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "e5b90d26f0c22c44c18d09618ad399dfb99f8296", "submitter": { "id": 9784, "url": "http://patchwork.ozlabs.org/api/people/9784/?format=api", "name": "Jacob Keller", "email": "jacob.e.keller@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/20160603224228.10192-3-jacob.e.keller@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/630069/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/630069/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<intel-wired-lan-bounces@lists.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" ], "Received": [ "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\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 3rLzdH0rP2z9t80\n\tfor <incoming@patchwork.ozlabs.org>;\n\tSat, 4 Jun 2016 08:42:59 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 9890785B75;\n\tFri, 3 Jun 2016 22:42:57 +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 bKWEzH3W5I4i; Fri, 3 Jun 2016 22:42:55 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id BFB7F8A421;\n\tFri, 3 Jun 2016 22:42:40 +0000 (UTC)", "from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\tby ash.osuosl.org (Postfix) with ESMTP id 093011C10E7\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 3 Jun 2016 22:42:35 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 069EB95878\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 3 Jun 2016 22:42:35 +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 qXoPbBkRVxEX for <intel-wired-lan@lists.osuosl.org>;\n\tFri, 3 Jun 2016 22:42:31 +0000 (UTC)", "from mga03.intel.com (mga03.intel.com [134.134.136.65])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 706DA9587A\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 3 Jun 2016 22:42:31 +0000 (UTC)", "from fmsmga002.fm.intel.com ([10.253.24.26])\n\tby orsmga103.jf.intel.com with ESMTP; 03 Jun 2016 15:42:31 -0700", "from jekeller-desk.amr.corp.intel.com (HELO\n\tjekeller-desk.jekeller.internal) ([134.134.3.116])\n\tby fmsmga002.fm.intel.com with ESMTP; 03 Jun 2016 15:42:31 -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-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.26,414,1459839600\"; d=\"scan'208\";a=\"994876048\"", "From": "Jacob Keller <jacob.e.keller@intel.com>", "To": "Intel Wired LAN <intel-wired-lan@lists.osuosl.org>", "Date": "Fri, 3 Jun 2016 15:42:12 -0700", "Message-Id": "<20160603224228.10192-3-jacob.e.keller@intel.com>", "X-Mailer": "git-send-email 2.8.2.820.gd1c5f70", "In-Reply-To": "<20160603224228.10192-1-jacob.e.keller@intel.com>", "References": "<20160603224228.10192-1-jacob.e.keller@intel.com>", "Subject": "[Intel-wired-lan] [PATCH v1 02/18] fm10k: avoid possible null\n\tpointer dereference in fm10k_update_stats", "X-BeenThere": "intel-wired-lan@lists.osuosl.org", "X-Mailman-Version": "2.1.18-1", "Precedence": "list", "List-Id": "Intel Wired Ethernet Linux Kernel Driver Development\n\t<intel-wired-lan.lists.osuosl.org>", "List-Unsubscribe": "<http://lists.osuosl.org/mailman/options/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@lists.osuosl.org?subject=unsubscribe>", "List-Archive": "<http://lists.osuosl.org/pipermail/intel-wired-lan/>", "List-Post": "<mailto:intel-wired-lan@lists.osuosl.org>", "List-Help": "<mailto:intel-wired-lan-request@lists.osuosl.org?subject=help>", "List-Subscribe": "<http://lists.osuosl.org/mailman/listinfo/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@lists.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@lists.osuosl.org", "Sender": "\"Intel-wired-lan\" <intel-wired-lan-bounces@lists.osuosl.org>" }, "content": "It's currently possible for fm10k_update_stats to be called during the\nwindow when we go down and the rings are removed. This can result in\na null pointer dereference. In fm10k_get_stats64 we work around this by\nusing ACCESS_ONCE and a null pointer check inside the loop. Use this\nsame flow in the fm10k_update_stats to avoid the potential null pointer.\n\nSigned-off-by: Jacob Keller <jacob.e.keller@intel.com>\n---\n drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 10 ++++++++--\n 1 file changed, 8 insertions(+), 2 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c\nindex 610c313610c8..be0b7dea6e72 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c\n@@ -377,7 +377,10 @@ void fm10k_update_stats(struct fm10k_intfc *interface)\n \n \t/* gather some stats to the interface struct that are per queue */\n \tfor (bytes = 0, pkts = 0, i = 0; i < interface->num_tx_queues; i++) {\n-\t\tstruct fm10k_ring *tx_ring = interface->tx_ring[i];\n+\t\tstruct fm10k_ring *tx_ring = READ_ONCE(interface->tx_ring[i]);\n+\n+\t\tif (!tx_ring)\n+\t\t\tcontinue;\n \n \t\trestart_queue += tx_ring->tx_stats.restart_queue;\n \t\ttx_busy += tx_ring->tx_stats.tx_busy;\n@@ -396,7 +399,10 @@ void fm10k_update_stats(struct fm10k_intfc *interface)\n \n \t/* gather some stats to the interface struct that are per queue */\n \tfor (bytes = 0, pkts = 0, i = 0; i < interface->num_rx_queues; i++) {\n-\t\tstruct fm10k_ring *rx_ring = interface->rx_ring[i];\n+\t\tstruct fm10k_ring *rx_ring = READ_ONCE(interface->rx_ring[i]);\n+\n+\t\tif (!rx_ring)\n+\t\t\tcontinue;\n \n \t\tbytes += rx_ring->stats.bytes;\n \t\tpkts += rx_ring->stats.packets;\n", "prefixes": [ "v1", "02/18" ] }