From a3f420fad1308f141bc34c1b845cc3e4ff4a9e8d Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 18 Dec 2019 07:58:41 +0100 Subject: [PATCH] drop net-sysfs-call-dev_hold-always-in-netdev_queue_add_kobject.patch --- ...d-always-in-netdev_queue_add_kobject.patch | 46 ------------------- queue-5.3/series | 1 - ...d-always-in-netdev_queue_add_kobject.patch | 46 ------------------- queue-5.4/series | 1 - 4 files changed, 94 deletions(-) delete mode 100644 queue-5.3/net-sysfs-call-dev_hold-always-in-netdev_queue_add_kobject.patch delete mode 100644 queue-5.4/net-sysfs-call-dev_hold-always-in-netdev_queue_add_kobject.patch diff --git a/queue-5.3/net-sysfs-call-dev_hold-always-in-netdev_queue_add_kobject.patch b/queue-5.3/net-sysfs-call-dev_hold-always-in-netdev_queue_add_kobject.patch deleted file mode 100644 index b58326740ee..00000000000 --- a/queue-5.3/net-sysfs-call-dev_hold-always-in-netdev_queue_add_kobject.patch +++ /dev/null @@ -1,46 +0,0 @@ -From foo@baz Tue 17 Dec 2019 08:14:58 PM CET -From: Jouni Hogander -Date: Thu, 5 Dec 2019 15:57:07 +0200 -Subject: net-sysfs: Call dev_hold always in netdev_queue_add_kobject - -From: Jouni Hogander - -[ Upstream commit e0b60903b434a7ee21ba8d8659f207ed84101e89 ] - -Dev_hold has to be called always in netdev_queue_add_kobject. -Otherwise usage count drops below 0 in case of failure in -kobject_init_and_add. - -Fixes: b8eb718348b8 ("net-sysfs: Fix reference count leak in rx|netdev_queue_add_kobject") -Reported-by: Hulk Robot -Cc: Tetsuo Handa -Cc: David Miller -Cc: Lukas Bulwahn -Signed-off-by: David S. Miller -Signed-off-by: Greg Kroah-Hartman ---- - net/core/net-sysfs.c | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - ---- a/net/core/net-sysfs.c -+++ b/net/core/net-sysfs.c -@@ -1457,14 +1457,17 @@ static int netdev_queue_add_kobject(stru - struct kobject *kobj = &queue->kobj; - int error = 0; - -+ /* Kobject_put later will trigger netdev_queue_release call -+ * which decreases dev refcount: Take that reference here -+ */ -+ dev_hold(queue->dev); -+ - kobj->kset = dev->queues_kset; - error = kobject_init_and_add(kobj, &netdev_queue_ktype, NULL, - "tx-%u", index); - if (error) - return error; - -- dev_hold(queue->dev); -- - #ifdef CONFIG_BQL - error = sysfs_create_group(kobj, &dql_group); - if (error) { diff --git a/queue-5.3/series b/queue-5.3/series index b1d677d2e53..ddf4a265fc4 100644 --- a/queue-5.3/series +++ b/queue-5.3/series @@ -4,7 +4,6 @@ net-bridge-deny-dev_set_mac_address-when-unregistering.patch net-dsa-fix-flow-dissection-on-tx-path.patch net-ethernet-ti-cpsw-fix-extra-rx-interrupt.patch net-sched-fix-dump-qlen-for-sch_mq-sch_mqprio-with-nolock-subqueues.patch -net-sysfs-call-dev_hold-always-in-netdev_queue_add_kobject.patch net-thunderx-start-phy-before-starting-autonegotiation.patch net-tls-fix-return-values-to-avoid-enotsupp.patch openvswitch-support-asymmetric-conntrack.patch diff --git a/queue-5.4/net-sysfs-call-dev_hold-always-in-netdev_queue_add_kobject.patch b/queue-5.4/net-sysfs-call-dev_hold-always-in-netdev_queue_add_kobject.patch deleted file mode 100644 index 3563418ed4b..00000000000 --- a/queue-5.4/net-sysfs-call-dev_hold-always-in-netdev_queue_add_kobject.patch +++ /dev/null @@ -1,46 +0,0 @@ -From foo@baz Tue 17 Dec 2019 08:13:44 PM CET -From: Jouni Hogander -Date: Thu, 5 Dec 2019 15:57:07 +0200 -Subject: net-sysfs: Call dev_hold always in netdev_queue_add_kobject - -From: Jouni Hogander - -[ Upstream commit e0b60903b434a7ee21ba8d8659f207ed84101e89 ] - -Dev_hold has to be called always in netdev_queue_add_kobject. -Otherwise usage count drops below 0 in case of failure in -kobject_init_and_add. - -Fixes: b8eb718348b8 ("net-sysfs: Fix reference count leak in rx|netdev_queue_add_kobject") -Reported-by: Hulk Robot -Cc: Tetsuo Handa -Cc: David Miller -Cc: Lukas Bulwahn -Signed-off-by: David S. Miller -Signed-off-by: Greg Kroah-Hartman ---- - net/core/net-sysfs.c | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - ---- a/net/core/net-sysfs.c -+++ b/net/core/net-sysfs.c -@@ -1459,14 +1459,17 @@ static int netdev_queue_add_kobject(stru - struct kobject *kobj = &queue->kobj; - int error = 0; - -+ /* Kobject_put later will trigger netdev_queue_release call -+ * which decreases dev refcount: Take that reference here -+ */ -+ dev_hold(queue->dev); -+ - kobj->kset = dev->queues_kset; - error = kobject_init_and_add(kobj, &netdev_queue_ktype, NULL, - "tx-%u", index); - if (error) - goto err; - -- dev_hold(queue->dev); -- - #ifdef CONFIG_BQL - error = sysfs_create_group(kobj, &dql_group); - if (error) diff --git a/queue-5.4/series b/queue-5.4/series index 4c6a4ccc3de..77bc2e6d351 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -5,7 +5,6 @@ net-dsa-fix-flow-dissection-on-tx-path.patch net-ethernet-ti-cpsw-fix-extra-rx-interrupt.patch net-sched-fix-dump-qlen-for-sch_mq-sch_mqprio-with-nolock-subqueues.patch net_sched-validate-tca_kind-attribute-in-tc_chain_tmplt_add.patch -net-sysfs-call-dev_hold-always-in-netdev_queue_add_kobject.patch net-thunderx-start-phy-before-starting-autonegotiation.patch net-tls-fix-return-values-to-avoid-enotsupp.patch openvswitch-support-asymmetric-conntrack.patch -- 2.47.3