From: Greg Kroah-Hartman Date: Mon, 24 Sep 2018 18:07:53 +0000 (+0200) Subject: drop gpiolib patch from 4.18 X-Git-Tag: v3.18.123~5 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=77d839e73462143296a4d0c4651b8799cab2d2a2;p=thirdparty%2Fkernel%2Fstable-queue.git drop gpiolib patch from 4.18 --- diff --git a/queue-4.18/gpiolib-don-t-allow-userspace-to-set-values-of-input-lines.patch b/queue-4.18/gpiolib-don-t-allow-userspace-to-set-values-of-input-lines.patch deleted file mode 100644 index 37aaebc8ba9..00000000000 --- a/queue-4.18/gpiolib-don-t-allow-userspace-to-set-values-of-input-lines.patch +++ /dev/null @@ -1,41 +0,0 @@ -From foo@baz Mon Sep 24 09:45:39 CEST 2018 -From: Bartosz Golaszewski -Date: Mon, 16 Jul 2018 10:34:23 +0200 -Subject: gpiolib: don't allow userspace to set values of input lines - -From: Bartosz Golaszewski - -[ Upstream commit e5332d5437764f775cf4e3b8ca3bf592af063a02 ] - -User space can currently both read and set values of input lines using -the character device. This was not allowed by the old sysfs interface -nor is it a correct behavior. - -Check the first descriptor in the set for the OUT flag when asked to -set values and return -EPERM if the line is input. - -Signed-off-by: Bartosz Golaszewski -Signed-off-by: Linus Walleij -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - drivers/gpio/gpiolib.c | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - ---- a/drivers/gpio/gpiolib.c -+++ b/drivers/gpio/gpiolib.c -@@ -449,7 +449,13 @@ static long linehandle_ioctl(struct file - - return 0; - } else if (cmd == GPIOHANDLE_SET_LINE_VALUES_IOCTL) { -- /* TODO: check if descriptors are really output */ -+ /* -+ * All line descriptors were created at once with the same -+ * flags so just check if the first one is really output. -+ */ -+ if (!test_bit(FLAG_IS_OUT, &lh->descs[0]->flags)) -+ return -EPERM; -+ - if (copy_from_user(&ghd, ip, sizeof(ghd))) - return -EFAULT; - diff --git a/queue-4.18/gpiolib-respect-error-code-of-get_direction.patch b/queue-4.18/gpiolib-respect-error-code-of-get_direction.patch index 92ecf2af757..b477cde6fba 100644 --- a/queue-4.18/gpiolib-respect-error-code-of-get_direction.patch +++ b/queue-4.18/gpiolib-respect-error-code-of-get_direction.patch @@ -24,7 +24,7 @@ Signed-off-by: Greg Kroah-Hartman --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c -@@ -3257,6 +3257,12 @@ int gpiochip_lock_as_irq(struct gpio_chi +@@ -3251,6 +3251,12 @@ int gpiochip_lock_as_irq(struct gpio_chi if (!chip->can_sleep && chip->get_direction) { int dir = chip->get_direction(chip, offset); diff --git a/queue-4.18/series b/queue-4.18/series index a47465c15bb..25bcf916712 100644 --- a/queue-4.18/series +++ b/queue-4.18/series @@ -174,7 +174,6 @@ arm-hisi-check-of_iomap-and-fix-missing-of_node_put.patch liquidio-fix-hang-when-re-binding-vf-host-drv-after-running-dpdk-vf-driver.patch gpu-ipu-v3-csi-pass-back-mbus_code_to_bus_cfg-error-codes.patch asoc-hdmi-codec-fix-routing.patch -gpiolib-don-t-allow-userspace-to-set-values-of-input-lines.patch serial-8250-of-correct-of_platform_serial_setup-error-handling.patch tty-fix-termios-input-speed-encoding-when-using-bother.patch tty-fix-termios-input-speed-encoding.patch