Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/692496/?format=api
{ "id": 692496, "url": "http://patchwork.ozlabs.org/api/patches/692496/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1478639119-14656-5-git-send-email-bimmy.pujari@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": "<1478639119-14656-5-git-send-email-bimmy.pujari@intel.com>", "list_archive_url": null, "date": "2016-11-08T21:05:08", "name": "[next,S52-V2,04/15] i40evf: protect against NULL msix_entries and q_vectors pointers", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "0c090cf09e38d3becad440d7a75d858ddc723a17", "submitter": { "id": 68919, "url": "http://patchwork.ozlabs.org/api/people/68919/?format=api", "name": "Pujari, Bimmy", "email": "bimmy.pujari@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/1478639119-14656-5-git-send-email-bimmy.pujari@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/692496/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/692496/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 fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\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 3tD21k46N2z9t2D\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 9 Nov 2016 08:07:06 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id DBDABC12C5;\n\tTue, 8 Nov 2016 21:07:04 +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 sT-XtHb09LuL; Tue, 8 Nov 2016 21:07:02 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 2E88DC1323;\n\tTue, 8 Nov 2016 21:07:02 +0000 (UTC)", "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ash.osuosl.org (Postfix) with ESMTP id 137251C22F9\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 8 Nov 2016 21:06:58 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 11B482E50D\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 8 Nov 2016 21:06:58 +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 eFW2SpcKenqg for <intel-wired-lan@lists.osuosl.org>;\n\tTue, 8 Nov 2016 21:06:54 +0000 (UTC)", "from mga05.intel.com (mga05.intel.com [192.55.52.43])\n\tby silver.osuosl.org (Postfix) with ESMTPS id 3057B2FD97\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 8 Nov 2016 21:06:54 +0000 (UTC)", "from fmsmga002.fm.intel.com ([10.253.24.26])\n\tby fmsmga105.fm.intel.com with ESMTP; 08 Nov 2016 13:06:54 -0800", "from bimmy.jf.intel.com (HELO bimmy.linux1.jf.intel.com)\n\t([134.134.2.167])\n\tby fmsmga002.fm.intel.com with ESMTP; 08 Nov 2016 13:06:53 -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-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos; i=\"5.31,611,1473145200\"; d=\"scan'208\";\n\ta=\"1082486380\"", "From": "Bimmy Pujari <bimmy.pujari@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Tue, 8 Nov 2016 13:05:08 -0800", "Message-Id": "<1478639119-14656-5-git-send-email-bimmy.pujari@intel.com>", "X-Mailer": "git-send-email 2.4.11", "In-Reply-To": "<1478639119-14656-1-git-send-email-bimmy.pujari@intel.com>", "References": "<1478639119-14656-1-git-send-email-bimmy.pujari@intel.com>", "Subject": "[Intel-wired-lan] [next PATCH S52-V2 04/15] i40evf: protect against\n\tNULL msix_entries and q_vectors pointers", "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": "From: Jacob Keller <jacob.e.keller@intel.com>\n\nUpdate the functions which free msix_entries and q_vectors so that they\nare safe against NULL values. This allows calling code to not care\nwhether these have already been freed when disabling and freeing them.\n\nSigned-off-by: Jacob Keller <jacob.e.keller@intel.com>\nChange-ID: I31bfd1c0da18023d971b618edc6fb049721f3298\n---\n drivers/net/ethernet/intel/i40evf/i40evf_main.c | 20 ++++++++++++++------\n 1 file changed, 14 insertions(+), 6 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40evf/i40evf_main.c b/drivers/net/ethernet/intel/i40evf/i40evf_main.c\nindex 420e545..ca85021 100644\n--- a/drivers/net/ethernet/intel/i40evf/i40evf_main.c\n+++ b/drivers/net/ethernet/intel/i40evf/i40evf_main.c\n@@ -207,6 +207,9 @@ static void i40evf_misc_irq_disable(struct i40evf_adapter *adapter)\n {\n \tstruct i40e_hw *hw = &adapter->hw;\n \n+\tif (!adapter->msix_entries)\n+\t\treturn;\n+\n \twr32(hw, I40E_VFINT_DYN_CTL01, 0);\n \n \t/* read flush */\n@@ -654,6 +657,9 @@ static void i40evf_free_misc_irq(struct i40evf_adapter *adapter)\n {\n \tstruct net_device *netdev = adapter->netdev;\n \n+\tif (!adapter->msix_entries)\n+\t\treturn;\n+\n \tfree_irq(adapter->msix_entries[0].vector, netdev);\n }\n \n@@ -1428,6 +1434,9 @@ static void i40evf_free_q_vectors(struct i40evf_adapter *adapter)\n \tint q_idx, num_q_vectors;\n \tint napi_vectors;\n \n+\tif (!adapter->q_vectors)\n+\t\treturn;\n+\n \tnum_q_vectors = adapter->num_msix_vectors - NONQ_VECS;\n \tnapi_vectors = adapter->num_active_queues;\n \n@@ -1437,6 +1446,7 @@ static void i40evf_free_q_vectors(struct i40evf_adapter *adapter)\n \t\t\tnetif_napi_del(&q_vector->napi);\n \t}\n \tkfree(adapter->q_vectors);\n+\tadapter->q_vectors = NULL;\n }\n \n /**\n@@ -2862,12 +2872,10 @@ static void i40evf_remove(struct pci_dev *pdev)\n \t\tmsleep(50);\n \t}\n \n-\tif (adapter->msix_entries) {\n-\t\ti40evf_misc_irq_disable(adapter);\n-\t\ti40evf_free_misc_irq(adapter);\n-\t\ti40evf_reset_interrupt_capability(adapter);\n-\t\ti40evf_free_q_vectors(adapter);\n-\t}\n+\ti40evf_misc_irq_disable(adapter);\n+\ti40evf_free_misc_irq(adapter);\n+\ti40evf_reset_interrupt_capability(adapter);\n+\ti40evf_free_q_vectors(adapter);\n \n \tif (adapter->watchdog_timer.function)\n \t\tdel_timer_sync(&adapter->watchdog_timer);\n", "prefixes": [ "next", "S52-V2", "04/15" ] }