Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1276668/?format=api
{ "id": 1276668, "url": "http://patchwork.ozlabs.org/api/patches/1276668/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20200424201623.10971-11-andre.guedes@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": "<20200424201623.10971-11-andre.guedes@intel.com>", "list_archive_url": null, "date": "2020-04-24T20:16:14", "name": "[10/19] igc: Fix locking issue when retrieving NFC rules", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "ba10ad7ac412175ac21ce74c7c73dc46e8737e5b", "submitter": { "id": 72323, "url": "http://patchwork.ozlabs.org/api/people/72323/?format=api", "name": "Andre Guedes", "email": "andre.guedes@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/20200424201623.10971-11-andre.guedes@intel.com/mbox/", "series": [ { "id": 172579, "url": "http://patchwork.ozlabs.org/api/series/172579/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=172579", "date": "2020-04-24T20:16:07", "name": "igc: Fixes to NFC support code", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/172579/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1276668/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1276668/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 spf=pass (sender SPF authorized) smtp.mailfrom=osuosl.org\n (client-ip=140.211.166.138; helo=whitealder.osuosl.org;\n envelope-from=intel-wired-lan-bounces@osuosl.org; receiver=<UNKNOWN>)", "ozlabs.org;\n dmarc=fail (p=none dis=none) header.from=intel.com" ], "Received": [ "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 49857j5YHcz9sSJ\n\tfor <incoming@patchwork.ozlabs.org>; Sat, 25 Apr 2020 06:17:37 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 468BC87F92;\n\tFri, 24 Apr 2020 20:17:36 +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 IsKHLh2Ytk0Y; Fri, 24 Apr 2020 20:17:33 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 3A0D488021;\n\tFri, 24 Apr 2020 20:17:33 +0000 (UTC)", "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n by ash.osuosl.org (Postfix) with ESMTP id BDE101BF83C\n for <intel-wired-lan@lists.osuosl.org>; Fri, 24 Apr 2020 20:17:28 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n by fraxinus.osuosl.org (Postfix) with ESMTP id BA53786BA9\n for <intel-wired-lan@lists.osuosl.org>; Fri, 24 Apr 2020 20:17:28 +0000 (UTC)", "from fraxinus.osuosl.org ([127.0.0.1])\n by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n with ESMTP id 5W2pcpmhSAcU for <intel-wired-lan@lists.osuosl.org>;\n Fri, 24 Apr 2020 20:17:28 +0000 (UTC)", "from mga04.intel.com (mga04.intel.com [192.55.52.120])\n by fraxinus.osuosl.org (Postfix) with ESMTPS id 42257868C9\n for <intel-wired-lan@lists.osuosl.org>; Fri, 24 Apr 2020 20:17:28 +0000 (UTC)", "from orsmga001.jf.intel.com ([10.7.209.18])\n by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 24 Apr 2020 13:17:27 -0700", "from kleandre-mobl.amr.corp.intel.com ([10.213.164.39])\n by orsmga001.jf.intel.com with ESMTP; 24 Apr 2020 13:17: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", "IronPort-SDR": [ "\n aiwywdPN/KP3JYGqyOBl5Rb4wB48BQMHdfhQlWkjk7qbaPCNdg1Tudj2ywtIk3FEsNis+QpVLq\n Q/v9KTplGmLw==", "\n nnCDQnp47gU/Z5gaEq4fc0Ang0IZ74K5ErWZ29KNayt38J7r+YoT73s50lpeGr7BsI0m66uObe\n b9JgXTtMhfWA==" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.73,313,1583222400\"; d=\"scan'208\";a=\"335474512\"", "From": "Andre Guedes <andre.guedes@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Fri, 24 Apr 2020 13:16:14 -0700", "Message-Id": "<20200424201623.10971-11-andre.guedes@intel.com>", "X-Mailer": "git-send-email 2.26.0", "In-Reply-To": "<20200424201623.10971-1-andre.guedes@intel.com>", "References": "<20200424201623.10971-1-andre.guedes@intel.com>", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [PATCH 10/19] igc: Fix locking issue when\n retrieving NFC rules", "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 <intel-wired-lan.osuosl.org>", "List-Unsubscribe": "<https://lists.osuosl.org/mailman/options/intel-wired-lan>,\n <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 <mailto:intel-wired-lan-request@osuosl.org?subject=subscribe>", "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": "Access to NFC rules stored in adapter->nfc_rule_list is protect by\nadapter->nfc_rule_lock. The functions igc_ethtool_get_nfc_rule()\nand igc_ethtool_get_nfc_rules() are missing to hold the lock while\naccessing rule objects.\n\nSigned-off-by: Andre Guedes <andre.guedes@intel.com>\n---\n drivers/net/ethernet/intel/igc/igc_ethtool.c | 19 ++++++++++++++++---\n 1 file changed, 16 insertions(+), 3 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/igc/igc_ethtool.c b/drivers/net/ethernet/intel/igc/igc_ethtool.c\nindex 93274e75e8c5..38ac61c04e5c 100644\n--- a/drivers/net/ethernet/intel/igc/igc_ethtool.c\n+++ b/drivers/net/ethernet/intel/igc/igc_ethtool.c\n@@ -939,16 +939,18 @@ static int igc_ethtool_get_nfc_rule(struct igc_adapter *adapter,\n \n \tcmd->data = IGC_MAX_RXNFC_RULES;\n \n+\tspin_lock(&adapter->nfc_rule_lock);\n+\n \thlist_for_each_entry(rule, &adapter->nfc_rule_list, nfc_node) {\n \t\tif (fsp->location <= rule->location)\n \t\t\tbreak;\n \t}\n \n \tif (!rule || fsp->location != rule->location)\n-\t\treturn -EINVAL;\n+\t\tgoto out;\n \n \tif (!rule->filter.match_flags)\n-\t\treturn -EINVAL;\n+\t\tgoto out;\n \n \tfsp->flow_type = ETHER_FLOW;\n \tfsp->ring_cookie = rule->action;\n@@ -976,7 +978,12 @@ static int igc_ethtool_get_nfc_rule(struct igc_adapter *adapter,\n \t\teth_broadcast_addr(fsp->m_u.ether_spec.h_source);\n \t}\n \n+\tspin_unlock(&adapter->nfc_rule_lock);\n \treturn 0;\n+\n+out:\n+\tspin_unlock(&adapter->nfc_rule_lock);\n+\treturn -EINVAL;\n }\n \n static int igc_ethtool_get_nfc_rules(struct igc_adapter *adapter,\n@@ -988,13 +995,19 @@ static int igc_ethtool_get_nfc_rules(struct igc_adapter *adapter,\n \n \tcmd->data = IGC_MAX_RXNFC_RULES;\n \n+\tspin_lock(&adapter->nfc_rule_lock);\n+\n \thlist_for_each_entry(rule, &adapter->nfc_rule_list, nfc_node) {\n-\t\tif (cnt == cmd->rule_cnt)\n+\t\tif (cnt == cmd->rule_cnt) {\n+\t\t\tspin_unlock(&adapter->nfc_rule_lock);\n \t\t\treturn -EMSGSIZE;\n+\t\t}\n \t\trule_locs[cnt] = rule->location;\n \t\tcnt++;\n \t}\n \n+\tspin_unlock(&adapter->nfc_rule_lock);\n+\n \tcmd->rule_cnt = cnt;\n \n \treturn 0;\n", "prefixes": [ "10/19" ] }