Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/922478/?format=api
{ "id": 922478, "url": "http://patchwork.ozlabs.org/api/patches/922478/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1527641079-7001-1-git-send-email-shannon.nelson@oracle.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": "<1527641079-7001-1-git-send-email-shannon.nelson@oracle.com>", "list_archive_url": null, "date": "2018-05-30T00:44:39", "name": "ixgbe: check ipsec ip addr against mgmt filter", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "4e14972524bc0eb674e30bc86f66847bb02f3e18", "submitter": { "id": 70766, "url": "http://patchwork.ozlabs.org/api/people/70766/?format=api", "name": "Shannon Nelson", "email": "shannon.nelson@oracle.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/1527641079-7001-1-git-send-email-shannon.nelson@oracle.com/mbox/", "series": [ { "id": 47380, "url": "http://patchwork.ozlabs.org/api/series/47380/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=47380", "date": "2018-05-30T00:44:39", "name": "ixgbe: check ipsec ip addr against mgmt filter", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/47380/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/922478/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/922478/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=oracle.com", "ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=oracle.com header.i=@oracle.com\n\theader.b=\"Jb37F2rK\"; dkim-atps=neutral" ], "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 40wX1S0prqz9s0q\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 30 May 2018 10:44:58 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 3931E86144;\n\tWed, 30 May 2018 00:44:56 +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 CN71te5Ccl7j; Wed, 30 May 2018 00:44:55 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 62A5986149;\n\tWed, 30 May 2018 00:44:55 +0000 (UTC)", "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ash.osuosl.org (Postfix) with ESMTP id 6D8EC1CF1EC\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 30 May 2018 00:44:52 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 69F5D26604\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 30 May 2018 00:44:52 +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 OpYIBjwrT6D0 for <intel-wired-lan@lists.osuosl.org>;\n\tWed, 30 May 2018 00:44:51 +0000 (UTC)", "from aserp2130.oracle.com (aserp2130.oracle.com [141.146.126.79])\n\tby silver.osuosl.org (Postfix) with ESMTPS id 83A5526588\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 30 May 2018 00:44:51 +0000 (UTC)", "from pps.filterd (aserp2130.oracle.com [127.0.0.1])\n\tby aserp2130.oracle.com (8.16.0.22/8.16.0.22) with SMTP id\n\tw4U0eqe1145072; Wed, 30 May 2018 00:44:49 GMT", "from userv0021.oracle.com (userv0021.oracle.com [156.151.31.71])\n\tby aserp2130.oracle.com with ESMTP id 2j9ev88aur-1\n\t(version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256\n\tverify=OK); Wed, 30 May 2018 00:44:49 +0000", "from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72])\n\tby userv0021.oracle.com (8.14.4/8.14.4) with ESMTP id w4U0im9C027402\n\t(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256\n\tverify=OK); Wed, 30 May 2018 00:44:48 GMT", "from abhmp0017.oracle.com (abhmp0017.oracle.com [141.146.116.23])\n\tby userv0121.oracle.com (8.14.4/8.13.8) with ESMTP id\n\tw4U0ilMB027073; Wed, 30 May 2018 00:44:47 GMT", "from slnelson-mint18.us.oracle.com (/10.159.224.8)\n\tby default (Oracle Beehive Gateway v4.0)\n\twith ESMTP ; Tue, 29 May 2018 17:44:47 -0700" ], "X-Virus-Scanned": [ "amavisd-new at osuosl.org", "amavisd-new at osuosl.org" ], "X-Greylist": "domain auto-whitelisted by SQLgrey-1.7.6", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com;\n\th=from : to : cc :\n\tsubject : date : message-id; s=corp-2017-10-26;\n\tbh=alnU1QLrlNI2knjI4OB8QzEXtqdIcCXOtXCnNp6YZ20=;\n\tb=Jb37F2rKAssINaCKS/KgRdGJ9GXJY4zSt+O06LC1HHeVadw7+98/5CdvJO8ArFWr826H\n\tju2VbaSpzGFAOQytEdFYhyeIxheViE5T3tp8svH/4Spgo3WgKWCaNk1Yy5DktuKIEnju\n\t50YJ4WTEhnh/5XrmhScuhVmOdALUSzZ1KjAhlghoUwbdVn3RcRiKGeBBkiwjYiNqX854\n\t091410Z9dQI9aM6HM0nEkTTB+PaaEVWuPUUTt66R5sp0/XlkQd4oFmtuDNGUfaql++kN\n\tRXlPOWPVKs/0t8gwibfjwHjty6G30V5LdEdWjs0QMmJupTdl4O1fdDBVg13c30mz8Y4V\n\tVg== ", "From": "Shannon Nelson <shannon.nelson@oracle.com>", "To": "intel-wired-lan@lists.osuosl.org, jeffrey.t.kirsher@intel.com", "Date": "Tue, 29 May 2018 17:44:39 -0700", "Message-Id": "<1527641079-7001-1-git-send-email-shannon.nelson@oracle.com>", "X-Mailer": "git-send-email 2.7.4", "X-Proofpoint-Virus-Version": "vendor=nai engine=5900 definitions=8908\n\tsignatures=668702", "X-Proofpoint-Spam-Details": "rule=notspam policy=default score=0 suspectscore=0\n\tmalwarescore=0\n\tphishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=999\n\tadultscore=0 classifier=spam adjust=0 reason=mlx scancount=1\n\tengine=8.0.1-1805220000 definitions=main-1805300006", "Subject": "[Intel-wired-lan] [PATCH] ixgbe: check ipsec ip addr against mgmt\n\tfilter", "X-BeenThere": "intel-wired-lan@osuosl.org", "X-Mailman-Version": "2.1.24", "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": "netdev@vger.kernel.org", "MIME-Version": "1.0", "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": "Make sure we don't try to offload the decryption of an incoming\npacket that should get delivered to the management engine. This\nis a corner case that will likely be very seldom seen, but could\nreally confuse someone if they were to hit it.\n\nSuggested-by: Jesse Brandeburg <jesse.brandeburg@intel.com>\nSigned-off-by: Shannon Nelson <shannon.nelson@oracle.com>\n---\n drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c | 64 ++++++++++++++++++++++++++\n 1 file changed, 64 insertions(+)", "diff": "diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c\nindex 99b170f..ea3b5fa 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c\n@@ -445,6 +445,65 @@ static int ixgbe_ipsec_parse_proto_keys(struct xfrm_state *xs,\n }\n \n /**\n+ * ixgbe_ipsec_check_mgmt_ip - make sure there is no clash with mgmt IP filters\n+ * @xs: pointer to transformer state struct\n+ **/\n+static int ixgbe_ipsec_check_mgmt_ip(struct xfrm_state *xs)\n+{\n+\tstruct net_device *dev = xs->xso.dev;\n+\tstruct ixgbe_adapter *adapter = netdev_priv(dev);\n+\tstruct ixgbe_hw *hw = &adapter->hw;\n+\tu32 mfval, manc, reg;\n+\tint num_filters = 4;\n+\tbool manc_ipv4;\n+\tint i, j;\n+\n+#define MANC_EN_IPV4_FILTER BIT(24)\n+#define MFVAL_IPV4_FILTER_SHIFT 16\n+#define MFVAL_IPV6_FILTER_SHIFT 24\n+#define MIPAF_ARR(_m, _n) (IXGBE_MIPAF + ((_m) * 0x10) + ((_n) * 4))\n+\n+\tmanc = IXGBE_READ_REG(hw, IXGBE_MANC);\n+\tmanc_ipv4 = !!(manc & MANC_EN_IPV4_FILTER);\n+\tmfval = IXGBE_READ_REG(hw, IXGBE_MFVAL);\n+\n+\tif (xs->props.family == AF_INET) {\n+\t\t/* are there any IPv4 filters to check? */\n+\t\tif (!manc_ipv4)\n+\t\t\treturn 0;\n+\n+\t\t/* the 4 ipv4 filters are all in MIPAF(3, i) */\n+\t\tfor (i = 0; i < num_filters; i++) {\n+\t\t\tif (!(mfval & BIT(MFVAL_IPV4_FILTER_SHIFT + i)))\n+\t\t\t\tcontinue;\n+\n+\t\t\treg = IXGBE_READ_REG(hw, MIPAF_ARR(3, i));\n+\t\t\tif (reg == xs->id.daddr.a4)\n+\t\t\t\treturn 1;\n+\t\t}\n+\t} else {\n+\t\t/* if there are ipv4 filters, they are in the last ipv6 slot */\n+\t\tif (manc_ipv4)\n+\t\t\tnum_filters = 3;\n+\n+\t\tfor (i = 0; i < num_filters; i++) {\n+\t\t\tif (!(mfval & BIT(MFVAL_IPV6_FILTER_SHIFT + i)))\n+\t\t\t\tcontinue;\n+\n+\t\t\tfor (j = 0; j < 4; j++) {\n+\t\t\t\treg = IXGBE_READ_REG(hw, MIPAF_ARR(i, j));\n+\t\t\t\tif (reg != xs->id.daddr.a6[j])\n+\t\t\t\t\tbreak;\n+\t\t\t}\n+\t\t\tif (j == 4) /* did we match all 4 words? */\n+\t\t\t\treturn 1;\n+\t\t}\n+\t}\n+\n+\treturn 0;\n+}\n+\n+/**\n * ixgbe_ipsec_add_sa - program device with a security association\n * @xs: pointer to transformer state struct\n **/\n@@ -465,6 +524,11 @@ static int ixgbe_ipsec_add_sa(struct xfrm_state *xs)\n \t\treturn -EINVAL;\n \t}\n \n+\tif (ixgbe_ipsec_check_mgmt_ip(xs)) {\n+\t\tnetdev_err(dev, \"IPsec IP addr clash with mgmt filters\\n\");\n+\t\treturn -EINVAL;\n+\t}\n+\n \tif (xs->xso.flags & XFRM_OFFLOAD_INBOUND) {\n \t\tstruct rx_sa rsa;\n \n", "prefixes": [] }