It's probably just not worth it for this really old kernel.
+++ /dev/null
-From 85a66e55019583da1e0f18706b7a8281c9f6de5b Mon Sep 17 00:00:00 2001
-From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-Date: Tue, 14 Feb 2017 10:23:34 -0800
-Subject: ptp: create "pins" together with the rest of attributes
-
-From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-
-commit 85a66e55019583da1e0f18706b7a8281c9f6de5b upstream.
-
-Let's switch to using device_create_with_groups(), which will allow us to
-create "pins" attribute group together with the rest of ptp device
-attributes, and before userspace gets notified about ptp device creation.
-
-Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/ptp/ptp_clock.c | 20 +++++++++++---------
- drivers/ptp/ptp_private.h | 7 ++++---
- drivers/ptp/ptp_sysfs.c | 39 +++++++++------------------------------
- 3 files changed, 24 insertions(+), 42 deletions(-)
-
---- a/drivers/ptp/ptp_clock.c
-+++ b/drivers/ptp/ptp_clock.c
-@@ -214,16 +214,17 @@ struct ptp_clock *ptp_clock_register(str
- mutex_init(&ptp->pincfg_mux);
- init_waitqueue_head(&ptp->tsev_wq);
-
-+ err = ptp_populate_pin_groups(ptp);
-+ if (err)
-+ goto no_pin_groups;
-+
- /* Create a new device in our class. */
-- ptp->dev = device_create(ptp_class, parent, ptp->devid, ptp,
-- "ptp%d", ptp->index);
-+ ptp->dev = device_create_with_groups(ptp_class, parent, ptp->devid,
-+ ptp, ptp->pin_attr_groups,
-+ "ptp%d", ptp->index);
- if (IS_ERR(ptp->dev))
- goto no_device;
-
-- err = ptp_populate_sysfs(ptp);
-- if (err)
-- goto no_sysfs;
--
- /* Register a new PPS source. */
- if (info->pps) {
- struct pps_source_info pps;
-@@ -251,10 +252,10 @@ no_clock:
- if (ptp->pps_source)
- pps_unregister_source(ptp->pps_source);
- no_pps:
-- ptp_cleanup_sysfs(ptp);
--no_sysfs:
- device_destroy(ptp_class, ptp->devid);
- no_device:
-+ ptp_cleanup_pin_groups(ptp);
-+no_pin_groups:
- mutex_destroy(&ptp->tsevq_mux);
- mutex_destroy(&ptp->pincfg_mux);
- ida_simple_remove(&ptp_clocks_map, index);
-@@ -273,8 +274,9 @@ int ptp_clock_unregister(struct ptp_cloc
- /* Release the clock's resources. */
- if (ptp->pps_source)
- pps_unregister_source(ptp->pps_source);
-- ptp_cleanup_sysfs(ptp);
-+
- device_destroy(ptp_class, ptp->devid);
-+ ptp_cleanup_pin_groups(ptp);
-
- posix_clock_unregister(&ptp->clock);
- return 0;
---- a/drivers/ptp/ptp_private.h
-+++ b/drivers/ptp/ptp_private.h
-@@ -54,6 +54,8 @@ struct ptp_clock {
- struct device_attribute *pin_dev_attr;
- struct attribute **pin_attr;
- struct attribute_group pin_attr_group;
-+ /* 1st entry is a pointer to the real group, 2nd is NULL terminator */
-+ const struct attribute_group *pin_attr_groups[2];
- };
-
- /*
-@@ -94,8 +96,7 @@ uint ptp_poll(struct posix_clock *pc,
-
- extern const struct attribute_group *ptp_groups[];
-
--int ptp_cleanup_sysfs(struct ptp_clock *ptp);
--
--int ptp_populate_sysfs(struct ptp_clock *ptp);
-+int ptp_populate_pin_groups(struct ptp_clock *ptp);
-+void ptp_cleanup_pin_groups(struct ptp_clock *ptp);
-
- #endif
---- a/drivers/ptp/ptp_sysfs.c
-+++ b/drivers/ptp/ptp_sysfs.c
-@@ -268,25 +268,14 @@ static ssize_t ptp_pin_store(struct devi
- return count;
- }
-
--int ptp_cleanup_sysfs(struct ptp_clock *ptp)
-+int ptp_populate_pin_groups(struct ptp_clock *ptp)
- {
-- struct device *dev = ptp->dev;
-- struct ptp_clock_info *info = ptp->info;
--
-- if (info->n_pins) {
-- sysfs_remove_group(&dev->kobj, &ptp->pin_attr_group);
-- kfree(ptp->pin_attr);
-- kfree(ptp->pin_dev_attr);
-- }
-- return 0;
--}
--
--static int ptp_populate_pins(struct ptp_clock *ptp)
--{
-- struct device *dev = ptp->dev;
- struct ptp_clock_info *info = ptp->info;
- int err = -ENOMEM, i, n_pins = info->n_pins;
-
-+ if (!n_pins)
-+ return 0;
-+
- ptp->pin_dev_attr = kcalloc(n_pins, sizeof(*ptp->pin_dev_attr),
- GFP_KERNEL);
- if (!ptp->pin_dev_attr)
-@@ -309,28 +298,18 @@ static int ptp_populate_pins(struct ptp_
- ptp->pin_attr_group.name = "pins";
- ptp->pin_attr_group.attrs = ptp->pin_attr;
-
-- err = sysfs_create_group(&dev->kobj, &ptp->pin_attr_group);
-- if (err)
-- goto no_group;
-+ ptp->pin_attr_groups[0] = &ptp->pin_attr_group;
-+
- return 0;
-
--no_group:
-- kfree(ptp->pin_attr);
- no_pin_attr:
- kfree(ptp->pin_dev_attr);
- no_dev_attr:
- return err;
- }
-
--int ptp_populate_sysfs(struct ptp_clock *ptp)
-+void ptp_cleanup_pin_groups(struct ptp_clock *ptp)
- {
-- struct ptp_clock_info *info = ptp->info;
-- int err;
--
-- if (info->n_pins) {
-- err = ptp_populate_pins(ptp);
-- if (err)
-- return err;
-- }
-- return 0;
-+ kfree(ptp->pin_attr);
-+ kfree(ptp->pin_dev_attr);
- }
+++ /dev/null
-From 882f312dc0751c973db26478f07f082c584d16aa Mon Sep 17 00:00:00 2001
-From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-Date: Tue, 14 Feb 2017 10:23:31 -0800
-Subject: ptp: do not explicitly set drvdata in ptp_clock_register()
-
-From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-
-commit 882f312dc0751c973db26478f07f082c584d16aa upstream.
-
-We do not need explicitly call dev_set_drvdata(), as it is done for us by
-device_create().
-
-Acked-by: Richard Cochran <richardcochran@gmail.com>
-Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/ptp/ptp_clock.c | 2 --
- 1 file changed, 2 deletions(-)
-
---- a/drivers/ptp/ptp_clock.c
-+++ b/drivers/ptp/ptp_clock.c
-@@ -220,8 +220,6 @@ struct ptp_clock *ptp_clock_register(str
- if (IS_ERR(ptp->dev))
- goto no_device;
-
-- dev_set_drvdata(ptp->dev, ptp);
--
- err = ptp_populate_sysfs(ptp);
- if (err)
- goto no_sysfs;
+++ /dev/null
-From aea0a897af9e44c258e8ab9296fad417f1bc063a Mon Sep 17 00:00:00 2001
-From: YueHaibing <yuehaibing@huawei.com>
-Date: Fri, 23 Nov 2018 09:54:55 +0800
-Subject: ptp: Fix pass zero to ERR_PTR() in ptp_clock_register
-
-From: YueHaibing <yuehaibing@huawei.com>
-
-commit aea0a897af9e44c258e8ab9296fad417f1bc063a upstream.
-
-Fix smatch warning:
-
-drivers/ptp/ptp_clock.c:298 ptp_clock_register() warn:
- passing zero to 'ERR_PTR'
-
-'err' should be set while device_create_with_groups and
-pps_register_source fails
-
-Fixes: 85a66e550195 ("ptp: create "pins" together with the rest of attributes")
-Signed-off-by: YueHaibing <yuehaibing@huawei.com>
-Acked-by: Richard Cochran <richardcochran@gmail.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/ptp/ptp_clock.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
---- a/drivers/ptp/ptp_clock.c
-+++ b/drivers/ptp/ptp_clock.c
-@@ -222,8 +222,10 @@ struct ptp_clock *ptp_clock_register(str
- ptp->dev = device_create_with_groups(ptp_class, parent, ptp->devid,
- ptp, ptp->pin_attr_groups,
- "ptp%d", ptp->index);
-- if (IS_ERR(ptp->dev))
-+ if (IS_ERR(ptp->dev)) {
-+ err = PTR_ERR(ptp->dev);
- goto no_device;
-+ }
-
- /* Register a new PPS source. */
- if (info->pps) {
-@@ -234,6 +236,7 @@ struct ptp_clock *ptp_clock_register(str
- pps.owner = info->owner;
- ptp->pps_source = pps_register_source(&pps, PTP_PPS_DEFAULTS);
- if (!ptp->pps_source) {
-+ err = -EINVAL;
- pr_err("failed to register pps source\n");
- goto no_pps;
- }
+++ /dev/null
-From foo@baz Thu 02 Jan 2020 11:49:15 AM CET
-From: Vladis Dronov <vdronov@redhat.com>
-Date: Fri, 27 Dec 2019 03:26:27 +0100
-Subject: ptp: fix the race between the release of ptp_clock and cdev
-
-From: Vladis Dronov <vdronov@redhat.com>
-
-[ Upstream commit a33121e5487b424339636b25c35d3a180eaa5f5e ]
-
-In a case when a ptp chardev (like /dev/ptp0) is open but an underlying
-device is removed, closing this file leads to a race. This reproduces
-easily in a kvm virtual machine:
-
-ts# cat openptp0.c
-int main() { ... fp = fopen("/dev/ptp0", "r"); ... sleep(10); }
-ts# uname -r
-5.5.0-rc3-46cf053e
-ts# cat /proc/cmdline
-... slub_debug=FZP
-ts# modprobe ptp_kvm
-ts# ./openptp0 &
-[1] 670
-opened /dev/ptp0, sleeping 10s...
-ts# rmmod ptp_kvm
-ts# ls /dev/ptp*
-ls: cannot access '/dev/ptp*': No such file or directory
-ts# ...woken up
-[ 48.010809] general protection fault: 0000 [#1] SMP
-[ 48.012502] CPU: 6 PID: 658 Comm: openptp0 Not tainted 5.5.0-rc3-46cf053e #25
-[ 48.014624] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), ...
-[ 48.016270] RIP: 0010:module_put.part.0+0x7/0x80
-[ 48.017939] RSP: 0018:ffffb3850073be00 EFLAGS: 00010202
-[ 48.018339] RAX: 000000006b6b6b6b RBX: 6b6b6b6b6b6b6b6b RCX: ffff89a476c00ad0
-[ 48.018936] RDX: fffff65a08d3ea08 RSI: 0000000000000247 RDI: 6b6b6b6b6b6b6b6b
-[ 48.019470] ... ^^^ a slub poison
-[ 48.023854] Call Trace:
-[ 48.024050] __fput+0x21f/0x240
-[ 48.024288] task_work_run+0x79/0x90
-[ 48.024555] do_exit+0x2af/0xab0
-[ 48.024799] ? vfs_write+0x16a/0x190
-[ 48.025082] do_group_exit+0x35/0x90
-[ 48.025387] __x64_sys_exit_group+0xf/0x10
-[ 48.025737] do_syscall_64+0x3d/0x130
-[ 48.026056] entry_SYSCALL_64_after_hwframe+0x44/0xa9
-[ 48.026479] RIP: 0033:0x7f53b12082f6
-[ 48.026792] ...
-[ 48.030945] Modules linked in: ptp i6300esb watchdog [last unloaded: ptp_kvm]
-[ 48.045001] Fixing recursive fault but reboot is needed!
-
-This happens in:
-
-static void __fput(struct file *file)
-{ ...
- if (file->f_op->release)
- file->f_op->release(inode, file); <<< cdev is kfree'd here
- if (unlikely(S_ISCHR(inode->i_mode) && inode->i_cdev != NULL &&
- !(mode & FMODE_PATH))) {
- cdev_put(inode->i_cdev); <<< cdev fields are accessed here
-
-Namely:
-
-__fput()
- posix_clock_release()
- kref_put(&clk->kref, delete_clock) <<< the last reference
- delete_clock()
- delete_ptp_clock()
- kfree(ptp) <<< cdev is embedded in ptp
- cdev_put
- module_put(p->owner) <<< *p is kfree'd, bang!
-
-Here cdev is embedded in posix_clock which is embedded in ptp_clock.
-The race happens because ptp_clock's lifetime is controlled by two
-refcounts: kref and cdev.kobj in posix_clock. This is wrong.
-
-Make ptp_clock's sysfs device a parent of cdev with cdev_device_add()
-created especially for such cases. This way the parent device with its
-ptp_clock is not released until all references to the cdev are released.
-This adds a requirement that an initialized but not exposed struct
-device should be provided to posix_clock_register() by a caller instead
-of a simple dev_t.
-
-This approach was adopted from the commit 72139dfa2464 ("watchdog: Fix
-the race between the release of watchdog_core_data and cdev"). See
-details of the implementation in the commit 233ed09d7fda ("chardev: add
-helper function to register char devs with a struct device").
-
-Link: https://lore.kernel.org/linux-fsdevel/20191125125342.6189-1-vdronov@redhat.com/T/#u
-Analyzed-by: Stephen Johnston <sjohnsto@redhat.com>
-Analyzed-by: Vern Lovejoy <vlovejoy@redhat.com>
-Signed-off-by: Vladis Dronov <vdronov@redhat.com>
-Acked-by: Richard Cochran <richardcochran@gmail.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/ptp/ptp_clock.c | 31 ++++++++++++++-----------------
- drivers/ptp/ptp_private.h | 2 +-
- include/linux/posix-clock.h | 19 +++++++++++--------
- kernel/time/posix-clock.c | 31 +++++++++++++------------------
- 4 files changed, 39 insertions(+), 44 deletions(-)
-
---- a/drivers/ptp/ptp_clock.c
-+++ b/drivers/ptp/ptp_clock.c
-@@ -171,9 +171,9 @@ static struct posix_clock_operations ptp
- .read = ptp_read,
- };
-
--static void delete_ptp_clock(struct posix_clock *pc)
-+static void ptp_clock_release(struct device *dev)
- {
-- struct ptp_clock *ptp = container_of(pc, struct ptp_clock, clock);
-+ struct ptp_clock *ptp = container_of(dev, struct ptp_clock, dev);
-
- mutex_destroy(&ptp->tsevq_mux);
- mutex_destroy(&ptp->pincfg_mux);
-@@ -205,7 +205,6 @@ struct ptp_clock *ptp_clock_register(str
- }
-
- ptp->clock.ops = ptp_clock_ops;
-- ptp->clock.release = delete_ptp_clock;
- ptp->info = info;
- ptp->devid = MKDEV(major, index);
- ptp->index = index;
-@@ -218,15 +217,6 @@ struct ptp_clock *ptp_clock_register(str
- if (err)
- goto no_pin_groups;
-
-- /* Create a new device in our class. */
-- ptp->dev = device_create_with_groups(ptp_class, parent, ptp->devid,
-- ptp, ptp->pin_attr_groups,
-- "ptp%d", ptp->index);
-- if (IS_ERR(ptp->dev)) {
-- err = PTR_ERR(ptp->dev);
-- goto no_device;
-- }
--
- /* Register a new PPS source. */
- if (info->pps) {
- struct pps_source_info pps;
-@@ -242,8 +232,18 @@ struct ptp_clock *ptp_clock_register(str
- }
- }
-
-- /* Create a posix clock. */
-- err = posix_clock_register(&ptp->clock, ptp->devid);
-+ /* Initialize a new device of our class in our clock structure. */
-+ device_initialize(&ptp->dev);
-+ ptp->dev.devt = ptp->devid;
-+ ptp->dev.class = ptp_class;
-+ ptp->dev.parent = parent;
-+ ptp->dev.groups = ptp->pin_attr_groups;
-+ ptp->dev.release = ptp_clock_release;
-+ dev_set_drvdata(&ptp->dev, ptp);
-+ dev_set_name(&ptp->dev, "ptp%d", ptp->index);
-+
-+ /* Create a posix clock and link it to the device. */
-+ err = posix_clock_register(&ptp->clock, &ptp->dev);
- if (err) {
- pr_err("failed to create posix clock\n");
- goto no_clock;
-@@ -255,8 +255,6 @@ no_clock:
- if (ptp->pps_source)
- pps_unregister_source(ptp->pps_source);
- no_pps:
-- device_destroy(ptp_class, ptp->devid);
--no_device:
- ptp_cleanup_pin_groups(ptp);
- no_pin_groups:
- mutex_destroy(&ptp->tsevq_mux);
-@@ -278,7 +276,6 @@ int ptp_clock_unregister(struct ptp_cloc
- if (ptp->pps_source)
- pps_unregister_source(ptp->pps_source);
-
-- device_destroy(ptp_class, ptp->devid);
- ptp_cleanup_pin_groups(ptp);
-
- posix_clock_unregister(&ptp->clock);
---- a/drivers/ptp/ptp_private.h
-+++ b/drivers/ptp/ptp_private.h
-@@ -40,7 +40,7 @@ struct timestamp_event_queue {
-
- struct ptp_clock {
- struct posix_clock clock;
-- struct device *dev;
-+ struct device dev;
- struct ptp_clock_info *info;
- dev_t devid;
- int index; /* index into clocks.map */
---- a/include/linux/posix-clock.h
-+++ b/include/linux/posix-clock.h
-@@ -104,29 +104,32 @@ struct posix_clock_operations {
- *
- * @ops: Functional interface to the clock
- * @cdev: Character device instance for this clock
-- * @kref: Reference count.
-+ * @dev: Pointer to the clock's device.
- * @rwsem: Protects the 'zombie' field from concurrent access.
- * @zombie: If 'zombie' is true, then the hardware has disappeared.
-- * @release: A function to free the structure when the reference count reaches
-- * zero. May be NULL if structure is statically allocated.
- *
- * Drivers should embed their struct posix_clock within a private
- * structure, obtaining a reference to it during callbacks using
- * container_of().
-+ *
-+ * Drivers should supply an initialized but not exposed struct device
-+ * to posix_clock_register(). It is used to manage lifetime of the
-+ * driver's private structure. It's 'release' field should be set to
-+ * a release function for this private structure.
- */
- struct posix_clock {
- struct posix_clock_operations ops;
- struct cdev cdev;
-- struct kref kref;
-+ struct device *dev;
- struct rw_semaphore rwsem;
- bool zombie;
-- void (*release)(struct posix_clock *clk);
- };
-
- /**
- * posix_clock_register() - register a new clock
-- * @clk: Pointer to the clock. Caller must provide 'ops' and 'release'
-- * @devid: Allocated device id
-+ * @clk: Pointer to the clock. Caller must provide 'ops' field
-+ * @dev: Pointer to the initialized device. Caller must provide
-+ * 'release' field
- *
- * A clock driver calls this function to register itself with the
- * clock device subsystem. If 'clk' points to dynamically allocated
-@@ -135,7 +138,7 @@ struct posix_clock {
- *
- * Returns zero on success, non-zero otherwise.
- */
--int posix_clock_register(struct posix_clock *clk, dev_t devid);
-+int posix_clock_register(struct posix_clock *clk, struct device *dev);
-
- /**
- * posix_clock_unregister() - unregister a clock
---- a/kernel/time/posix-clock.c
-+++ b/kernel/time/posix-clock.c
-@@ -25,8 +25,6 @@
- #include <linux/syscalls.h>
- #include <linux/uaccess.h>
-
--static void delete_clock(struct kref *kref);
--
- /*
- * Returns NULL if the posix_clock instance attached to 'fp' is old and stale.
- */
-@@ -168,7 +166,7 @@ static int posix_clock_open(struct inode
- err = 0;
-
- if (!err) {
-- kref_get(&clk->kref);
-+ get_device(clk->dev);
- fp->private_data = clk;
- }
- out:
-@@ -184,7 +182,7 @@ static int posix_clock_release(struct in
- if (clk->ops.release)
- err = clk->ops.release(clk);
-
-- kref_put(&clk->kref, delete_clock);
-+ put_device(clk->dev);
-
- fp->private_data = NULL;
-
-@@ -206,38 +204,35 @@ static const struct file_operations posi
- #endif
- };
-
--int posix_clock_register(struct posix_clock *clk, dev_t devid)
-+int posix_clock_register(struct posix_clock *clk, struct device *dev)
- {
- int err;
-
-- kref_init(&clk->kref);
- init_rwsem(&clk->rwsem);
-
- cdev_init(&clk->cdev, &posix_clock_file_operations);
-+ err = cdev_device_add(&clk->cdev, dev);
-+ if (err) {
-+ pr_err("%s unable to add device %d:%d\n",
-+ dev_name(dev), MAJOR(dev->devt), MINOR(dev->devt));
-+ return err;
-+ }
- clk->cdev.owner = clk->ops.owner;
-- err = cdev_add(&clk->cdev, devid, 1);
-+ clk->dev = dev;
-
-- return err;
-+ return 0;
- }
- EXPORT_SYMBOL_GPL(posix_clock_register);
-
--static void delete_clock(struct kref *kref)
--{
-- struct posix_clock *clk = container_of(kref, struct posix_clock, kref);
--
-- if (clk->release)
-- clk->release(clk);
--}
--
- void posix_clock_unregister(struct posix_clock *clk)
- {
-- cdev_del(&clk->cdev);
-+ cdev_device_del(&clk->cdev, clk->dev);
-
- down_write(&clk->rwsem);
- clk->zombie = true;
- up_write(&clk->rwsem);
-
-- kref_put(&clk->kref, delete_clock);
-+ put_device(clk->dev);
- }
- EXPORT_SYMBOL_GPL(posix_clock_unregister);
-
+++ /dev/null
-From af59e717d5ff9c8dbf9bcc581c0dfb3b2a9c9030 Mon Sep 17 00:00:00 2001
-From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-Date: Tue, 14 Feb 2017 10:23:33 -0800
-Subject: ptp: use is_visible method to hide unused attributes
-
-From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-
-commit af59e717d5ff9c8dbf9bcc581c0dfb3b2a9c9030 upstream.
-
-Instead of creating selected attributes after the device is created (and
-after userspace potentially seen uevent), lets use attribute group
-is_visible() method to control which attributes are shown. This will allow
-us to create all attributes (except "pins" group, which will be taken care
-of later) before userspace gets notified about new ptp class device.
-
-Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/ptp/ptp_sysfs.c | 125 +++++++++++++++++++++---------------------------
- 1 file changed, 55 insertions(+), 70 deletions(-)
-
---- a/drivers/ptp/ptp_sysfs.c
-+++ b/drivers/ptp/ptp_sysfs.c
-@@ -46,27 +46,6 @@ PTP_SHOW_INT(n_periodic_outputs, n_per_o
- PTP_SHOW_INT(n_programmable_pins, n_pins);
- PTP_SHOW_INT(pps_available, pps);
-
--static struct attribute *ptp_attrs[] = {
-- &dev_attr_clock_name.attr,
-- &dev_attr_max_adjustment.attr,
-- &dev_attr_n_alarms.attr,
-- &dev_attr_n_external_timestamps.attr,
-- &dev_attr_n_periodic_outputs.attr,
-- &dev_attr_n_programmable_pins.attr,
-- &dev_attr_pps_available.attr,
-- NULL,
--};
--
--static const struct attribute_group ptp_group = {
-- .attrs = ptp_attrs,
--};
--
--const struct attribute_group *ptp_groups[] = {
-- &ptp_group,
-- NULL,
--};
--
--
- static ssize_t extts_enable_store(struct device *dev,
- struct device_attribute *attr,
- const char *buf, size_t count)
-@@ -91,6 +70,7 @@ static ssize_t extts_enable_store(struct
- out:
- return err;
- }
-+static DEVICE_ATTR(extts_enable, 0220, NULL, extts_enable_store);
-
- static ssize_t extts_fifo_show(struct device *dev,
- struct device_attribute *attr, char *page)
-@@ -124,6 +104,7 @@ out:
- mutex_unlock(&ptp->tsevq_mux);
- return cnt;
- }
-+static DEVICE_ATTR(fifo, 0444, extts_fifo_show, NULL);
-
- static ssize_t period_store(struct device *dev,
- struct device_attribute *attr,
-@@ -151,6 +132,7 @@ static ssize_t period_store(struct devic
- out:
- return err;
- }
-+static DEVICE_ATTR(period, 0220, NULL, period_store);
-
- static ssize_t pps_enable_store(struct device *dev,
- struct device_attribute *attr,
-@@ -177,6 +159,57 @@ static ssize_t pps_enable_store(struct d
- out:
- return err;
- }
-+static DEVICE_ATTR(pps_enable, 0220, NULL, pps_enable_store);
-+
-+static struct attribute *ptp_attrs[] = {
-+ &dev_attr_clock_name.attr,
-+
-+ &dev_attr_max_adjustment.attr,
-+ &dev_attr_n_alarms.attr,
-+ &dev_attr_n_external_timestamps.attr,
-+ &dev_attr_n_periodic_outputs.attr,
-+ &dev_attr_n_programmable_pins.attr,
-+ &dev_attr_pps_available.attr,
-+
-+ &dev_attr_extts_enable.attr,
-+ &dev_attr_fifo.attr,
-+ &dev_attr_period.attr,
-+ &dev_attr_pps_enable.attr,
-+ NULL
-+};
-+
-+static umode_t ptp_is_attribute_visible(struct kobject *kobj,
-+ struct attribute *attr, int n)
-+{
-+ struct device *dev = kobj_to_dev(kobj);
-+ struct ptp_clock *ptp = dev_get_drvdata(dev);
-+ struct ptp_clock_info *info = ptp->info;
-+ umode_t mode = attr->mode;
-+
-+ if (attr == &dev_attr_extts_enable.attr ||
-+ attr == &dev_attr_fifo.attr) {
-+ if (!info->n_ext_ts)
-+ mode = 0;
-+ } else if (attr == &dev_attr_period.attr) {
-+ if (!info->n_per_out)
-+ mode = 0;
-+ } else if (attr == &dev_attr_pps_enable.attr) {
-+ if (!info->pps)
-+ mode = 0;
-+ }
-+
-+ return mode;
-+}
-+
-+static const struct attribute_group ptp_group = {
-+ .is_visible = ptp_is_attribute_visible,
-+ .attrs = ptp_attrs,
-+};
-+
-+const struct attribute_group *ptp_groups[] = {
-+ &ptp_group,
-+ NULL
-+};
-
- static int ptp_pin_name2index(struct ptp_clock *ptp, const char *name)
- {
-@@ -235,26 +268,11 @@ static ssize_t ptp_pin_store(struct devi
- return count;
- }
-
--static DEVICE_ATTR(extts_enable, 0220, NULL, extts_enable_store);
--static DEVICE_ATTR(fifo, 0444, extts_fifo_show, NULL);
--static DEVICE_ATTR(period, 0220, NULL, period_store);
--static DEVICE_ATTR(pps_enable, 0220, NULL, pps_enable_store);
--
- int ptp_cleanup_sysfs(struct ptp_clock *ptp)
- {
- struct device *dev = ptp->dev;
- struct ptp_clock_info *info = ptp->info;
-
-- if (info->n_ext_ts) {
-- device_remove_file(dev, &dev_attr_extts_enable);
-- device_remove_file(dev, &dev_attr_fifo);
-- }
-- if (info->n_per_out)
-- device_remove_file(dev, &dev_attr_period);
--
-- if (info->pps)
-- device_remove_file(dev, &dev_attr_pps_enable);
--
- if (info->n_pins) {
- sysfs_remove_group(&dev->kobj, &ptp->pin_attr_group);
- kfree(ptp->pin_attr);
-@@ -306,46 +324,13 @@ no_dev_attr:
-
- int ptp_populate_sysfs(struct ptp_clock *ptp)
- {
-- struct device *dev = ptp->dev;
- struct ptp_clock_info *info = ptp->info;
- int err;
-
-- if (info->n_ext_ts) {
-- err = device_create_file(dev, &dev_attr_extts_enable);
-- if (err)
-- goto out1;
-- err = device_create_file(dev, &dev_attr_fifo);
-- if (err)
-- goto out2;
-- }
-- if (info->n_per_out) {
-- err = device_create_file(dev, &dev_attr_period);
-- if (err)
-- goto out3;
-- }
-- if (info->pps) {
-- err = device_create_file(dev, &dev_attr_pps_enable);
-- if (err)
-- goto out4;
-- }
- if (info->n_pins) {
- err = ptp_populate_pins(ptp);
- if (err)
-- goto out5;
-+ return err;
- }
- return 0;
--out5:
-- if (info->pps)
-- device_remove_file(dev, &dev_attr_pps_enable);
--out4:
-- if (info->n_per_out)
-- device_remove_file(dev, &dev_attr_period);
--out3:
-- if (info->n_ext_ts)
-- device_remove_file(dev, &dev_attr_fifo);
--out2:
-- if (info->n_ext_ts)
-- device_remove_file(dev, &dev_attr_extts_enable);
--out1:
-- return err;
- }
+++ /dev/null
-From 6f7aa56bae6ff38727d5c8bf6ee7d4202b4e3865 Mon Sep 17 00:00:00 2001
-From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-Date: Tue, 14 Feb 2017 10:23:32 -0800
-Subject: ptp: use kcalloc when allocating arrays
-
-From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-
-commit 6f7aa56bae6ff38727d5c8bf6ee7d4202b4e3865 upstream.
-
-kcalloc is more semantically correct when allocating arrays of objects, and
-overflow-safe.
-
-Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/ptp/ptp_sysfs.c | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
---- a/drivers/ptp/ptp_sysfs.c
-+++ b/drivers/ptp/ptp_sysfs.c
-@@ -269,13 +269,12 @@ static int ptp_populate_pins(struct ptp_
- struct ptp_clock_info *info = ptp->info;
- int err = -ENOMEM, i, n_pins = info->n_pins;
-
-- ptp->pin_dev_attr = kzalloc(n_pins * sizeof(*ptp->pin_dev_attr),
-+ ptp->pin_dev_attr = kcalloc(n_pins, sizeof(*ptp->pin_dev_attr),
- GFP_KERNEL);
- if (!ptp->pin_dev_attr)
- goto no_dev_attr;
-
-- ptp->pin_attr = kzalloc((1 + n_pins) * sizeof(struct attribute *),
-- GFP_KERNEL);
-+ ptp->pin_attr = kcalloc(1 + n_pins, sizeof(*ptp->pin_attr), GFP_KERNEL);
- if (!ptp->pin_attr)
- goto no_pin_attr;
-
pinctrl-baytrail-really-serialize-all-register-acces.patch
mmc-sdhci-update-the-tuning-failed-messages-to-pr_de.patch
net-ena-fix-napi-handler-misbehavior-when-the-napi-budget-is-zero.patch
-ptp-do-not-explicitly-set-drvdata-in-ptp_clock_register.patch
-ptp-use-kcalloc-when-allocating-arrays.patch
-ptp-use-is_visible-method-to-hide-unused-attributes.patch
-ptp-create-pins-together-with-the-rest-of-attributes.patch
-ptp-fix-pass-zero-to-err_ptr-in-ptp_clock_register.patch
-ptp-fix-the-race-between-the-release-of-ptp_clock-and-cdev.patch
vhost-vsock-accept-only-packets-with-the-right-dst_cid.patch
tcp-dccp-fix-possible-race-__inet_lookup_established.patch
tcp-do-not-send-empty-skb-from-tcp_write_xmit.patch
projects / thirdparty / kernel / stable-queue.git / commitdiff
