Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/607449/?format=api
{ "id": 607449, "url": "http://patchwork.ozlabs.org/api/patches/607449/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1460042483-16169-1-git-send-email-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": "<1460042483-16169-1-git-send-email-jacob.e.keller@intel.com>", "list_archive_url": null, "date": "2016-04-07T15:21:20", "name": "[v1,1/4] fm10k: fix possible null pointer deref after kcalloc", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "5bba7b9fb70a595873b31919d364e66cbdac1565", "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/1460042483-16169-1-git-send-email-jacob.e.keller@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/607449/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/607449/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\tby ozlabs.org (Postfix) with ESMTP id 3qgmXL3xBmz9t4T\n\tfor <incoming@patchwork.ozlabs.org>;\n\tFri, 8 Apr 2016 01:21:37 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id C4571C0123;\n\tThu, 7 Apr 2016 15:21:36 +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 fIZf5xXleTHh; Thu, 7 Apr 2016 15:21:36 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 10746C0116;\n\tThu, 7 Apr 2016 15:21:30 +0000 (UTC)", "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ash.osuosl.org (Postfix) with ESMTP id BDB5B1C2926\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 7 Apr 2016 15:21:27 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id A9D5586932\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 7 Apr 2016 15:21:27 +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 oYkTIRz4MJ3L for <intel-wired-lan@lists.osuosl.org>;\n\tThu, 7 Apr 2016 15:21:26 +0000 (UTC)", "from mga02.intel.com (mga02.intel.com [134.134.136.20])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id A95D286A56\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 7 Apr 2016 15:21:26 +0000 (UTC)", "from orsmga001.jf.intel.com ([10.7.209.18])\n\tby orsmga101.jf.intel.com with ESMTP; 07 Apr 2016 08:21:25 -0700", "from jekeller-desk.amr.corp.intel.com (HELO\n\tjekeller-desk.jekeller.internal) ([134.134.3.173])\n\tby orsmga001.jf.intel.com with ESMTP; 07 Apr 2016 08:21:26 -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.24,449,1455004800\"; d=\"scan'208\";a=\"927603913\"", "From": "Jacob Keller <jacob.e.keller@intel.com>", "To": "Intel Wired LAN <intel-wired-lan@lists.osuosl.org>", "Date": "Thu, 7 Apr 2016 08:21:20 -0700", "Message-Id": "<1460042483-16169-1-git-send-email-jacob.e.keller@intel.com>", "X-Mailer": "git-send-email 2.8.1.102.ga49ec4a", "Subject": "[Intel-wired-lan] [PATCH v1 1/4] fm10k: fix possible null pointer\n\tderef after kcalloc", "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": "When writing a new default redirection table, we needed to populate\na new RSS table using ethtool_rxfh_indir_default. We populated this\ntable into a region of memory allocated using kcalloc, but never checked\nthis for NULL. Fix this by moving the default table generation into\nfm10k_write_reta. If this function is passed a table, use it. Otherwise,\ngenerate the default table using ethtool_rxfh_indir_default, 4 at at\ntime.\n\nFixes: 0ea7fae44094 (\"fm10k: use ethtool_rxfh_indir_default for default redirection table\", 2016-02-16)\nSigned-off-by: Jacob Keller <jacob.e.keller@intel.com>\n---\n\nNotes:\n Testing-hints:\n This is a very unlikely memory failure, but you should test changing the\n number of queues, and the RSS table and make sure it behaves as expected.\n\n drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c | 26 ++++++++++++++++++------\n drivers/net/ethernet/intel/fm10k/fm10k_main.c | 14 ++-----------\n 2 files changed, 22 insertions(+), 18 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c b/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c\nindex 27991348b659..24700a8026ed 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c\n@@ -970,15 +970,29 @@ u32 fm10k_get_reta_size(struct net_device __always_unused *netdev)\n \n void fm10k_write_reta(struct fm10k_intfc *interface, const u32 *indir)\n {\n+\tu16 rss_i = interface->ring_feature[RING_F_RSS].indices;\n \tstruct fm10k_hw *hw = &interface->hw;\n-\tint i;\n+\tu32 table[4];\n+\tint i, j;\n \n \t/* record entries to reta table */\n-\tfor (i = 0; i < FM10K_RETA_SIZE; i++, indir += 4) {\n-\t\tu32 reta = indir[0] |\n-\t\t\t (indir[1] << 8) |\n-\t\t\t (indir[2] << 16) |\n-\t\t\t (indir[3] << 24);\n+\tfor (i = 0; i < FM10K_RETA_SIZE; i++) {\n+\t\tu32 reta, n;\n+\n+\t\t/* generate a new table if we weren't given one */\n+\t\tfor (j = 0; j < 4; j++) {\n+\t\t\tif (indir)\n+\t\t\t\tn = indir[i + j];\n+\t\t\telse\n+\t\t\t\tn = ethtool_rxfh_indir_default(i + j, rss_i);\n+\n+\t\t\ttable[j] = n;\n+\t\t}\n+\n+\t\treta = table[0] |\n+\t\t\t(table[1] << 8) |\n+\t\t\t(table[2] << 16) |\n+\t\t\t(table[3] << 24);\n \n \t\tif (interface->reta[i] == reta)\n \t\t\tcontinue;\ndiff --git a/drivers/net/ethernet/intel/fm10k/fm10k_main.c b/drivers/net/ethernet/intel/fm10k/fm10k_main.c\nindex 58092e523bbe..aca3e4762da7 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k_main.c\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k_main.c\n@@ -1927,8 +1927,7 @@ static void fm10k_assign_rings(struct fm10k_intfc *interface)\n static void fm10k_init_reta(struct fm10k_intfc *interface)\n {\n \tu16 i, rss_i = interface->ring_feature[RING_F_RSS].indices;\n-\tstruct net_device *netdev = interface->netdev;\n-\tu32 reta, *indir;\n+\tu32 reta;\n \n \t/* If the Rx flow indirection table has been configured manually, we\n \t * need to maintain it when possible.\n@@ -1953,16 +1952,7 @@ static void fm10k_init_reta(struct fm10k_intfc *interface)\n \t}\n \n repopulate_reta:\n-\tindir = kcalloc(fm10k_get_reta_size(netdev),\n-\t\t\tsizeof(indir[0]), GFP_KERNEL);\n-\n-\t/* generate redirection table using the default kernel policy */\n-\tfor (i = 0; i < fm10k_get_reta_size(netdev); i++)\n-\t\tindir[i] = ethtool_rxfh_indir_default(i, rss_i);\n-\n-\tfm10k_write_reta(interface, indir);\n-\n-\tkfree(indir);\n+\tfm10k_write_reta(interface, NULL);\n }\n \n /**\n", "prefixes": [ "v1", "1/4" ] }