drop gpio-cdev-sanitize-the-label-before-requesting-the-interrupt.patch for now

diff --git a/queue-6.6/gpio-cdev-sanitize-the-label-before-requesting-the-interrupt.patch b/queue-6.6/gpio-cdev-sanitize-the-label-before-requesting-the-interrupt.patch
deleted file mode 100644 (file)
index 87a18a5..0000000
--- a/queue-6.6/gpio-cdev-sanitize-the-label-before-requesting-the-interrupt.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-From b34490879baa847d16fc529c8ea6e6d34f004b38 Mon Sep 17 00:00:00 2001
-From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
-Date: Mon, 25 Mar 2024 10:02:42 +0100
-Subject: gpio: cdev: sanitize the label before requesting the interrupt
-
-From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
-
-commit b34490879baa847d16fc529c8ea6e6d34f004b38 upstream.
-
-When an interrupt is requested, a procfs directory is created under
-"/proc/irq/<irqnum>/<label>" where <label> is the string passed to one of
-the request_irq() variants.
-
-What follows is that the string must not contain the "/" character or
-the procfs mkdir operation will fail. We don't have such constraints for
-GPIO consumer labels which are used verbatim as interrupt labels for
-GPIO irqs. We must therefore sanitize the consumer string before
-requesting the interrupt.
-
-Let's replace all "/" with ":".
-
-Cc: stable@vger.kernel.org
-Reported-by: Stefan Wahren <wahrenst@gmx.net>
-Closes: https://lore.kernel.org/linux-gpio/39fe95cb-aa83-4b8b-8cab-63947a726754@gmx.net/
-Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
-Reviewed-by: Kent Gibson <warthog618@gmail.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/gpio/gpiolib-cdev.c |   38 ++++++++++++++++++++++++++++++++------
- 1 file changed, 32 insertions(+), 6 deletions(-)
-
---- a/drivers/gpio/gpiolib-cdev.c
-+++ b/drivers/gpio/gpiolib-cdev.c
-@@ -1010,10 +1010,20 @@ static u32 gpio_v2_line_config_debounce_
-       return 0;
- }
- 
-+static inline char *make_irq_label(const char *orig)
-+{
-+      return kstrdup_and_replace(orig, '/', ':', GFP_KERNEL);
-+}
-+
-+static inline void free_irq_label(const char *label)
-+{
-+      kfree(label);
-+}
-+
- static void edge_detector_stop(struct line *line)
- {
-       if (line->irq) {
--              free_irq(line->irq, line);
-+              free_irq_label(free_irq(line->irq, line));
-               line->irq = 0;
-       }
- 
-@@ -1038,6 +1048,7 @@ static int edge_detector_setup(struct li
-       unsigned long irqflags = 0;
-       u64 eflags;
-       int irq, ret;
-+      char *label;
- 
-       eflags = edflags & GPIO_V2_LINE_EDGE_FLAGS;
-       if (eflags && !kfifo_initialized(&line->req->events)) {
-@@ -1074,11 +1085,17 @@ static int edge_detector_setup(struct li
-                       IRQF_TRIGGER_RISING : IRQF_TRIGGER_FALLING;
-       irqflags |= IRQF_ONESHOT;
- 
-+      label = make_irq_label(line->req->label);
-+      if (!label)
-+              return -ENOMEM;
-+
-       /* Request a thread to read the events */
-       ret = request_threaded_irq(irq, edge_irq_handler, edge_irq_thread,
--                                 irqflags, line->req->label, line);
--      if (ret)
-+                                 irqflags, label, line);
-+      if (ret) {
-+              free_irq_label(label);
-               return ret;
-+      }
- 
-       line->irq = irq;
-       return 0;
-@@ -1943,7 +1960,7 @@ static void lineevent_free(struct lineev
-               blocking_notifier_chain_unregister(&le->gdev->device_notifier,
-                                                  &le->device_unregistered_nb);
-       if (le->irq)
--              free_irq(le->irq, le);
-+              free_irq_label(free_irq(le->irq, le));
-       if (le->desc)
-               gpiod_free(le->desc);
-       kfree(le->label);
-@@ -2091,6 +2108,7 @@ static int lineevent_create(struct gpio_
-       int fd;
-       int ret;
-       int irq, irqflags = 0;
-+      char *label;
- 
-       if (copy_from_user(&eventreq, ip, sizeof(eventreq)))
-               return -EFAULT;
-@@ -2175,15 +2193,23 @@ static int lineevent_create(struct gpio_
-       if (ret)
-               goto out_free_le;
- 
-+      label = make_irq_label(le->label);
-+      if (!label) {
-+              ret = -ENOMEM;
-+              goto out_free_le;
-+      }
-+
-       /* Request a thread to read the events */
-       ret = request_threaded_irq(irq,
-                                  lineevent_irq_handler,
-                                  lineevent_irq_thread,
-                                  irqflags,
--                                 le->label,
-+                                 label,
-                                  le);
--      if (ret)
-+      if (ret) {
-+              free_irq_label(label);
-               goto out_free_le;
-+      }
- 
-       le->irq = irq;
- 

diff --git a/queue-6.6/series b/queue-6.6/series
index 9f9ca50e7401b48cc009b75fc9daf654dd213d2a..febcc559c957ea88485236a45963097681ae7094 100644 (file)
--- a/queue-6.6/series
+++ b/queue-6.6/series
@@ -320,7 +320,6 @@ wifi-cfg80211-add-a-flag-to-disable-wireless-extensions.patch
 wifi-iwlwifi-mvm-disable-mlo-for-the-time-being.patch
 wifi-iwlwifi-fw-don-t-always-use-fw-dump-trig.patch
 revert-drm-amd-display-fix-sending-vsc-colorimetry-packets-for-dp-edp-displays-without-psr.patch
-gpio-cdev-sanitize-the-label-before-requesting-the-interrupt.patch
 exec-fix-nommu-linux_binprm-exec-in-transfer_args_to_stack.patch
 hexagon-vmlinux.lds.s-handle-attributes-section.patch
 mm-cachestat-fix-two-shmem-bugs.patch

diff --git a/queue-6.7/gpio-cdev-sanitize-the-label-before-requesting-the-interrupt.patch b/queue-6.7/gpio-cdev-sanitize-the-label-before-requesting-the-interrupt.patch
deleted file mode 100644 (file)
index 87a18a5..0000000
--- a/queue-6.7/gpio-cdev-sanitize-the-label-before-requesting-the-interrupt.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-From b34490879baa847d16fc529c8ea6e6d34f004b38 Mon Sep 17 00:00:00 2001
-From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
-Date: Mon, 25 Mar 2024 10:02:42 +0100
-Subject: gpio: cdev: sanitize the label before requesting the interrupt
-
-From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
-
-commit b34490879baa847d16fc529c8ea6e6d34f004b38 upstream.
-
-When an interrupt is requested, a procfs directory is created under
-"/proc/irq/<irqnum>/<label>" where <label> is the string passed to one of
-the request_irq() variants.
-
-What follows is that the string must not contain the "/" character or
-the procfs mkdir operation will fail. We don't have such constraints for
-GPIO consumer labels which are used verbatim as interrupt labels for
-GPIO irqs. We must therefore sanitize the consumer string before
-requesting the interrupt.
-
-Let's replace all "/" with ":".
-
-Cc: stable@vger.kernel.org
-Reported-by: Stefan Wahren <wahrenst@gmx.net>
-Closes: https://lore.kernel.org/linux-gpio/39fe95cb-aa83-4b8b-8cab-63947a726754@gmx.net/
-Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
-Reviewed-by: Kent Gibson <warthog618@gmail.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/gpio/gpiolib-cdev.c |   38 ++++++++++++++++++++++++++++++++------
- 1 file changed, 32 insertions(+), 6 deletions(-)
-
---- a/drivers/gpio/gpiolib-cdev.c
-+++ b/drivers/gpio/gpiolib-cdev.c
-@@ -1010,10 +1010,20 @@ static u32 gpio_v2_line_config_debounce_
-       return 0;
- }
- 
-+static inline char *make_irq_label(const char *orig)
-+{
-+      return kstrdup_and_replace(orig, '/', ':', GFP_KERNEL);
-+}
-+
-+static inline void free_irq_label(const char *label)
-+{
-+      kfree(label);
-+}
-+
- static void edge_detector_stop(struct line *line)
- {
-       if (line->irq) {
--              free_irq(line->irq, line);
-+              free_irq_label(free_irq(line->irq, line));
-               line->irq = 0;
-       }
- 
-@@ -1038,6 +1048,7 @@ static int edge_detector_setup(struct li
-       unsigned long irqflags = 0;
-       u64 eflags;
-       int irq, ret;
-+      char *label;
- 
-       eflags = edflags & GPIO_V2_LINE_EDGE_FLAGS;
-       if (eflags && !kfifo_initialized(&line->req->events)) {
-@@ -1074,11 +1085,17 @@ static int edge_detector_setup(struct li
-                       IRQF_TRIGGER_RISING : IRQF_TRIGGER_FALLING;
-       irqflags |= IRQF_ONESHOT;
- 
-+      label = make_irq_label(line->req->label);
-+      if (!label)
-+              return -ENOMEM;
-+
-       /* Request a thread to read the events */
-       ret = request_threaded_irq(irq, edge_irq_handler, edge_irq_thread,
--                                 irqflags, line->req->label, line);
--      if (ret)
-+                                 irqflags, label, line);
-+      if (ret) {
-+              free_irq_label(label);
-               return ret;
-+      }
- 
-       line->irq = irq;
-       return 0;
-@@ -1943,7 +1960,7 @@ static void lineevent_free(struct lineev
-               blocking_notifier_chain_unregister(&le->gdev->device_notifier,
-                                                  &le->device_unregistered_nb);
-       if (le->irq)
--              free_irq(le->irq, le);
-+              free_irq_label(free_irq(le->irq, le));
-       if (le->desc)
-               gpiod_free(le->desc);
-       kfree(le->label);
-@@ -2091,6 +2108,7 @@ static int lineevent_create(struct gpio_
-       int fd;
-       int ret;
-       int irq, irqflags = 0;
-+      char *label;
- 
-       if (copy_from_user(&eventreq, ip, sizeof(eventreq)))
-               return -EFAULT;
-@@ -2175,15 +2193,23 @@ static int lineevent_create(struct gpio_
-       if (ret)
-               goto out_free_le;
- 
-+      label = make_irq_label(le->label);
-+      if (!label) {
-+              ret = -ENOMEM;
-+              goto out_free_le;
-+      }
-+
-       /* Request a thread to read the events */
-       ret = request_threaded_irq(irq,
-                                  lineevent_irq_handler,
-                                  lineevent_irq_thread,
-                                  irqflags,
--                                 le->label,
-+                                 label,
-                                  le);
--      if (ret)
-+      if (ret) {
-+              free_irq_label(label);
-               goto out_free_le;
-+      }
- 
-       le->irq = irq;
- 

diff --git a/queue-6.7/series b/queue-6.7/series
index 120dc6ffc5c0121586c938d569caa28070e39baa..4c7b2ba66fe7ad192c72be49875acd38b060f596 100644 (file)
--- a/queue-6.7/series
+++ b/queue-6.7/series
@@ -346,7 +346,6 @@ wifi-iwlwifi-mvm-disable-mlo-for-the-time-being.patch
 wifi-iwlwifi-fw-don-t-always-use-fw-dump-trig.patch
 wifi-iwlwifi-mvm-handle-debugfs-names-more-carefully.patch
 revert-drm-amd-display-fix-sending-vsc-colorimetry-packets-for-dp-edp-displays-without-psr.patch
-gpio-cdev-sanitize-the-label-before-requesting-the-interrupt.patch
 exec-fix-nommu-linux_binprm-exec-in-transfer_args_to_stack.patch
 hexagon-vmlinux.lds.s-handle-attributes-section.patch
 mm-cachestat-fix-two-shmem-bugs.patch

diff --git a/queue-6.8/gpio-cdev-sanitize-the-label-before-requesting-the-interrupt.patch b/queue-6.8/gpio-cdev-sanitize-the-label-before-requesting-the-interrupt.patch
deleted file mode 100644 (file)
index 402d8c5..0000000
--- a/queue-6.8/gpio-cdev-sanitize-the-label-before-requesting-the-interrupt.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-From b34490879baa847d16fc529c8ea6e6d34f004b38 Mon Sep 17 00:00:00 2001
-From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
-Date: Mon, 25 Mar 2024 10:02:42 +0100
-Subject: gpio: cdev: sanitize the label before requesting the interrupt
-
-From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
-
-commit b34490879baa847d16fc529c8ea6e6d34f004b38 upstream.
-
-When an interrupt is requested, a procfs directory is created under
-"/proc/irq/<irqnum>/<label>" where <label> is the string passed to one of
-the request_irq() variants.
-
-What follows is that the string must not contain the "/" character or
-the procfs mkdir operation will fail. We don't have such constraints for
-GPIO consumer labels which are used verbatim as interrupt labels for
-GPIO irqs. We must therefore sanitize the consumer string before
-requesting the interrupt.
-
-Let's replace all "/" with ":".
-
-Cc: stable@vger.kernel.org
-Reported-by: Stefan Wahren <wahrenst@gmx.net>
-Closes: https://lore.kernel.org/linux-gpio/39fe95cb-aa83-4b8b-8cab-63947a726754@gmx.net/
-Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
-Reviewed-by: Kent Gibson <warthog618@gmail.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/gpio/gpiolib-cdev.c |   38 ++++++++++++++++++++++++++++++++------
- 1 file changed, 32 insertions(+), 6 deletions(-)
-
---- a/drivers/gpio/gpiolib-cdev.c
-+++ b/drivers/gpio/gpiolib-cdev.c
-@@ -1089,10 +1089,20 @@ static u32 gpio_v2_line_config_debounce_
-       return 0;
- }
- 
-+static inline char *make_irq_label(const char *orig)
-+{
-+      return kstrdup_and_replace(orig, '/', ':', GFP_KERNEL);
-+}
-+
-+static inline void free_irq_label(const char *label)
-+{
-+      kfree(label);
-+}
-+
- static void edge_detector_stop(struct line *line)
- {
-       if (line->irq) {
--              free_irq(line->irq, line);
-+              free_irq_label(free_irq(line->irq, line));
-               line->irq = 0;
-       }
- 
-@@ -1116,6 +1126,7 @@ static int edge_detector_setup(struct li
-       unsigned long irqflags = 0;
-       u64 eflags;
-       int irq, ret;
-+      char *label;
- 
-       eflags = edflags & GPIO_V2_LINE_EDGE_FLAGS;
-       if (eflags && !kfifo_initialized(&line->req->events)) {
-@@ -1152,11 +1163,17 @@ static int edge_detector_setup(struct li
-                       IRQF_TRIGGER_RISING : IRQF_TRIGGER_FALLING;
-       irqflags |= IRQF_ONESHOT;
- 
-+      label = make_irq_label(line->req->label);
-+      if (!label)
-+              return -ENOMEM;
-+
-       /* Request a thread to read the events */
-       ret = request_threaded_irq(irq, edge_irq_handler, edge_irq_thread,
--                                 irqflags, line->req->label, line);
--      if (ret)
-+                                 irqflags, label, line);
-+      if (ret) {
-+              free_irq_label(label);
-               return ret;
-+      }
- 
-       line->irq = irq;
-       return 0;
-@@ -1979,7 +1996,7 @@ static void lineevent_free(struct lineev
-               blocking_notifier_chain_unregister(&le->gdev->device_notifier,
-                                                  &le->device_unregistered_nb);
-       if (le->irq)
--              free_irq(le->irq, le);
-+              free_irq_label(free_irq(le->irq, le));
-       if (le->desc)
-               gpiod_free(le->desc);
-       kfree(le->label);
-@@ -2120,6 +2137,7 @@ static int lineevent_create(struct gpio_
-       int fd;
-       int ret;
-       int irq, irqflags = 0;
-+      char *label;
- 
-       if (copy_from_user(&eventreq, ip, sizeof(eventreq)))
-               return -EFAULT;
-@@ -2204,15 +2222,23 @@ static int lineevent_create(struct gpio_
-       if (ret)
-               goto out_free_le;
- 
-+      label = make_irq_label(le->label);
-+      if (!label) {
-+              ret = -ENOMEM;
-+              goto out_free_le;
-+      }
-+
-       /* Request a thread to read the events */
-       ret = request_threaded_irq(irq,
-                                  lineevent_irq_handler,
-                                  lineevent_irq_thread,
-                                  irqflags,
--                                 le->label,
-+                                 label,
-                                  le);
--      if (ret)
-+      if (ret) {
-+              free_irq_label(label);
-               goto out_free_le;
-+      }
- 
-       le->irq = irq;
- 

diff --git a/queue-6.8/series b/queue-6.8/series
index b1464722dacf4d499707b3a79194beeca4af7072..441830321a1a7ac78e1fa96b11f3977d6dbe5d28 100644 (file)
--- a/queue-6.8/series
+++ b/queue-6.8/series
@@ -301,7 +301,6 @@ wifi-iwlwifi-mvm-disable-mlo-for-the-time-being.patch
 wifi-iwlwifi-fw-don-t-always-use-fw-dump-trig.patch
 wifi-iwlwifi-mvm-handle-debugfs-names-more-carefully.patch
 revert-drm-amd-display-fix-sending-vsc-colorimetry-packets-for-dp-edp-displays-without-psr.patch
-gpio-cdev-sanitize-the-label-before-requesting-the-interrupt.patch
 fbdev-select-i-o-memory-framebuffer-ops-for-sbus.patch
 exec-fix-nommu-linux_binprm-exec-in-transfer_args_to_stack.patch
 hexagon-vmlinux.lds.s-handle-attributes-section.patch