Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1168044/?format=api
{ "id": 1168044, "url": "http://patchwork.ozlabs.org/api/patches/1168044/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20190926181109.4871-2-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": "<20190926181109.4871-2-jacob.e.keller@intel.com>", "list_archive_url": null, "date": "2019-09-26T18:11:03", "name": "[net-next,v3,1/7] ptp: correctly disable flags on old ioctls", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "e14249be413ba02cd0afc0c5889e5e883a397659", "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/20190926181109.4871-2-jacob.e.keller@intel.com/mbox/", "series": [ { "id": 132779, "url": "http://patchwork.ozlabs.org/api/series/132779/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=132779", "date": "2019-09-26T18:11:02", "name": "new PTP ioctl fixes", "version": 3, "mbox": "http://patchwork.ozlabs.org/series/132779/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1168044/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1168044/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.133; helo=hemlock.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=intel.com" ], "Received": [ "from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 46fNKT3Np8z9sPY\n\tfor <incoming@patchwork.ozlabs.org>;\n\tFri, 27 Sep 2019 04:11:24 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id A112887E9B;\n\tThu, 26 Sep 2019 18:11:22 +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 9A8Aq+diHcFw; Thu, 26 Sep 2019 18:11:21 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id EACDD87E91;\n\tThu, 26 Sep 2019 18:11:21 +0000 (UTC)", "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\tby ash.osuosl.org (Postfix) with ESMTP id 5B4E91BF336\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 26 Sep 2019 18:11:20 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 58221861B2\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 26 Sep 2019 18:11:20 +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 btrMo9owl4zt for <intel-wired-lan@lists.osuosl.org>;\n\tThu, 26 Sep 2019 18:11:19 +0000 (UTC)", "from mga09.intel.com (mga09.intel.com [134.134.136.24])\n\tby fraxinus.osuosl.org (Postfix) with ESMTPS id A006881A2B\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 26 Sep 2019 18:11:19 +0000 (UTC)", "from orsmga005.jf.intel.com ([10.7.209.41])\n\tby orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t26 Sep 2019 11:11:19 -0700", "from jekeller-desk.amr.corp.intel.com ([10.166.244.172])\n\tby orsmga005.jf.intel.com with ESMTP; 26 Sep 2019 11:11:19 -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-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.64,552,1559545200\"; d=\"scan'208\";a=\"364882879\"", "From": "Jacob Keller <jacob.e.keller@intel.com>", "To": "netdev@vger.kernel.org", "Date": "Thu, 26 Sep 2019 11:11:03 -0700", "Message-Id": "<20190926181109.4871-2-jacob.e.keller@intel.com>", "X-Mailer": "git-send-email 2.23.0.245.gf157bbb9169d", "In-Reply-To": "<20190926181109.4871-1-jacob.e.keller@intel.com>", "References": "<20190926181109.4871-1-jacob.e.keller@intel.com>", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [net-next v3 1/7] ptp: correctly disable flags on\n\told ioctls", "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\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": "Christopher Hall <christopher.s.hall@intel.com>,\n\tFelipe Balbi <felipe.balbi@linux.intel.com>,\n\tRichard Cochran <richardcochran@gmail.com>,\n\tIntel Wired LAN <intel-wired-lan@lists.osuosl.org>,\n\t\"David S . Miller\" <davem@davemloft.net>", "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": "Commit 415606588c61 (\"PTP: introduce new versions of IOCTLs\",\n2019-09-13) introduced new versions of the PTP ioctls which actually\nvalidate that the flags are acceptable values.\n\nAs part of this, it cleared the flags value using a bitwise\nand+negation, in an attempt to prevent the old ioctl from accidentally\nenabling new features.\n\nThis is incorrect for a couple of reasons. First, it results in\naccidentally preventing previously working flags on the request ioctl.\nBy clearing the \"valid\" flags, we now no longer allow setting the\nenable, rising edge, or falling edge flags.\n\nSecond, if we add new additional flags in the future, they must not be\nset by the old ioctl. (Since the flag wasn't checked before, we could\npotentially break userspace programs which sent garbage flag data.\n\nThe correct way to resolve this is to check for and clear all but the\noriginally valid flags.\n\nCreate defines indicating which flags are correctly checked and\ninterpreted by the original ioctls. Use these to clear any bits which\nwill not be correctly interpreted by the original ioctls.\n\nIn the future, new flags must be added to the VALID_FLAGS macros, but\n*not* to the V1_VALID_FLAGS macros. In this way, new features may be\nexposed over the v2 ioctls, but without breaking previous userspace\nwhich happened to not clear the flags value properly. The old ioctl will\ncontinue to behave the same way, while the new ioctl gains the benefit\nof using the flags fields.\n\nCc: Richard Cochran <richardcochran@gmail.com>\nCc: Felipe Balbi <felipe.balbi@linux.intel.com>\nCc: David S. Miller <davem@davemloft.net>\nCc: Christopher Hall <christopher.s.hall@intel.com>\nSigned-off-by: Jacob Keller <jacob.e.keller@intel.com>\n---\n drivers/ptp/ptp_chardev.c | 4 ++--\n include/uapi/linux/ptp_clock.h | 22 ++++++++++++++++++++++\n 2 files changed, 24 insertions(+), 2 deletions(-)", "diff": "diff --git a/drivers/ptp/ptp_chardev.c b/drivers/ptp/ptp_chardev.c\nindex 9c18476d8d10..67d0199840fd 100644\n--- a/drivers/ptp/ptp_chardev.c\n+++ b/drivers/ptp/ptp_chardev.c\n@@ -155,7 +155,7 @@ long ptp_ioctl(struct posix_clock *pc, unsigned int cmd, unsigned long arg)\n \t\t\terr = -EINVAL;\n \t\t\tbreak;\n \t\t} else if (cmd == PTP_EXTTS_REQUEST) {\n-\t\t\treq.extts.flags &= ~PTP_EXTTS_VALID_FLAGS;\n+\t\t\treq.extts.flags &= PTP_EXTTS_V1_VALID_FLAGS;\n \t\t\treq.extts.rsv[0] = 0;\n \t\t\treq.extts.rsv[1] = 0;\n \t\t}\n@@ -184,7 +184,7 @@ long ptp_ioctl(struct posix_clock *pc, unsigned int cmd, unsigned long arg)\n \t\t\terr = -EINVAL;\n \t\t\tbreak;\n \t\t} else if (cmd == PTP_PEROUT_REQUEST) {\n-\t\t\treq.perout.flags &= ~PTP_PEROUT_VALID_FLAGS;\n+\t\t\treq.perout.flags &= PTP_PEROUT_V1_VALID_FLAGS;\n \t\t\treq.perout.rsv[0] = 0;\n \t\t\treq.perout.rsv[1] = 0;\n \t\t\treq.perout.rsv[2] = 0;\ndiff --git a/include/uapi/linux/ptp_clock.h b/include/uapi/linux/ptp_clock.h\nindex f16301015949..59e89a1bc3bb 100644\n--- a/include/uapi/linux/ptp_clock.h\n+++ b/include/uapi/linux/ptp_clock.h\n@@ -31,15 +31,37 @@\n #define PTP_ENABLE_FEATURE (1<<0)\n #define PTP_RISING_EDGE (1<<1)\n #define PTP_FALLING_EDGE (1<<2)\n+\n+/*\n+ * flag fields valid for the new PTP_EXTTS_REQUEST2 ioctl.\n+ */\n #define PTP_EXTTS_VALID_FLAGS\t(PTP_ENABLE_FEATURE |\t\\\n \t\t\t\t PTP_RISING_EDGE |\t\\\n \t\t\t\t PTP_FALLING_EDGE)\n \n+/*\n+ * flag fields valid for the original PTP_EXTTS_REQUEST ioctl.\n+ * DO NOT ADD NEW FLAGS HERE.\n+ */\n+#define PTP_EXTTS_V1_VALID_FLAGS\t(PTP_ENABLE_FEATURE |\t\\\n+\t\t\t\t\t PTP_RISING_EDGE |\t\\\n+\t\t\t\t\t PTP_FALLING_EDGE)\n+\n /*\n * Bits of the ptp_perout_request.flags field:\n */\n #define PTP_PEROUT_ONE_SHOT (1<<0)\n+\n+/*\n+ * flag fields valid for the new PTP_PEROUT_REQUEST2 ioctl.\n+ */\n #define PTP_PEROUT_VALID_FLAGS\t(PTP_PEROUT_ONE_SHOT)\n+\n+/*\n+ * No flags are valid for the original PTP_PEROUT_REQUEST ioctl\n+ */\n+#define PTP_PEROUT_V1_VALID_FLAGS\t(0)\n+\n /*\n * struct ptp_clock_time - represents a time value\n *\n", "prefixes": [ "net-next", "v3", "1/7" ] }