+++ /dev/null
-From d0aeb51d4e4bf55ef4414ecc34457d0b3f35d0cf Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 31 Dec 2021 00:55:15 +0100
-Subject: drm/meson: Fix error handling when afbcd.ops->init fails
-
-From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
-
-[ Upstream commit fa747d75f65d1b1cbc3f4691fa67b695e8a399c8 ]
-
-When afbcd.ops->init fails we need to free the struct drm_device. Also
-all errors which come after afbcd.ops->init was successful need to exit
-the AFBCD, just like meson_drv_unbind() does.
-
-Fixes: d1b5e41e13a7e9 ("drm/meson: Add AFBCD module driver")
-Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
-Acked-by: Neil Armstrong <narmstrong@baylibre.com>
-Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
-Link: https://patchwork.freedesktop.org/patch/msgid/20211230235515.1627522-3-martin.blumenstingl@googlemail.com
-Stable-dep-of: ba98413bf45e ("drm/meson: fix missing component unbind on bind errors")
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/gpu/drm/meson/meson_drv.c | 13 ++++++++-----
- 1 file changed, 8 insertions(+), 5 deletions(-)
-
-diff --git a/drivers/gpu/drm/meson/meson_drv.c b/drivers/gpu/drm/meson/meson_drv.c
-index 9959522ce802d..6da4a40e54565 100644
---- a/drivers/gpu/drm/meson/meson_drv.c
-+++ b/drivers/gpu/drm/meson/meson_drv.c
-@@ -266,27 +266,27 @@ static int meson_drv_bind_master(struct device *dev, bool has_components)
-
- ret = meson_venc_cvbs_create(priv);
- if (ret)
-- goto free_drm;
-+ goto exit_afbcd;
-
- if (has_components) {
- ret = component_bind_all(drm->dev, drm);
- if (ret) {
- dev_err(drm->dev, "Couldn't bind all components\n");
-- goto free_drm;
-+ goto exit_afbcd;
- }
- }
-
- ret = meson_plane_create(priv);
- if (ret)
-- goto free_drm;
-+ goto exit_afbcd;
-
- ret = meson_crtc_create(priv);
- if (ret)
-- goto free_drm;
-+ goto exit_afbcd;
-
- ret = drm_irq_install(drm, priv->vsync_irq);
- if (ret)
-- goto free_drm;
-+ goto exit_afbcd;
-
- drm_mode_config_reset(drm);
-
-@@ -309,6 +309,9 @@ static int meson_drv_bind_master(struct device *dev, bool has_components)
-
- uninstall_irq:
- drm_irq_uninstall(drm);
-+exit_afbcd:
-+ if (priv->afbcd.ops)
-+ priv->afbcd.ops->exit(priv);
- free_drm:
- drm_dev_put(drm);
-
---
-2.39.2
-
+++ /dev/null
-From 8fe3dfb16320b692e84769c5f4972837f379427f Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 6 Mar 2023 11:35:33 +0100
-Subject: drm/meson: fix missing component unbind on bind errors
-
-From: Johan Hovold <johan+linaro@kernel.org>
-
-[ Upstream commit ba98413bf45edbf33672e2539e321b851b2cfbd1 ]
-
-Make sure to unbind all subcomponents when binding the aggregate device
-fails.
-
-Fixes: a41e82e6c457 ("drm/meson: Add support for components")
-Cc: stable@vger.kernel.org # 4.12
-Cc: Neil Armstrong <neil.armstrong@linaro.org>
-Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
-Acked-by: Neil Armstrong <neil.armstrong@linaro.org>
-Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
-Link: https://patchwork.freedesktop.org/patch/msgid/20230306103533.4915-1-johan+linaro@kernel.org
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/gpu/drm/meson/meson_drv.c | 9 ++++++---
- 1 file changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/drivers/gpu/drm/meson/meson_drv.c b/drivers/gpu/drm/meson/meson_drv.c
-index 6da4a40e54565..adb8ce6eac43e 100644
---- a/drivers/gpu/drm/meson/meson_drv.c
-+++ b/drivers/gpu/drm/meson/meson_drv.c
-@@ -278,15 +278,15 @@ static int meson_drv_bind_master(struct device *dev, bool has_components)
-
- ret = meson_plane_create(priv);
- if (ret)
-- goto exit_afbcd;
-+ goto unbind_all;
-
- ret = meson_crtc_create(priv);
- if (ret)
-- goto exit_afbcd;
-+ goto unbind_all;
-
- ret = drm_irq_install(drm, priv->vsync_irq);
- if (ret)
-- goto exit_afbcd;
-+ goto unbind_all;
-
- drm_mode_config_reset(drm);
-
-@@ -309,6 +309,9 @@ static int meson_drv_bind_master(struct device *dev, bool has_components)
-
- uninstall_irq:
- drm_irq_uninstall(drm);
-+unbind_all:
-+ if (has_components)
-+ component_unbind_all(drm->dev, drm);
- exit_afbcd:
- if (priv->afbcd.ops)
- priv->afbcd.ops->exit(priv);
---
-2.39.2
-
--- /dev/null
+From 89aba4c26fae4e459f755a18912845c348ee48f3 Mon Sep 17 00:00:00 2001
+From: Heiko Carstens <hca@linux.ibm.com>
+Date: Thu, 23 Mar 2023 13:09:16 +0100
+Subject: s390/uaccess: add missing earlyclobber annotations to __clear_user()
+
+From: Heiko Carstens <hca@linux.ibm.com>
+
+commit 89aba4c26fae4e459f755a18912845c348ee48f3 upstream.
+
+Add missing earlyclobber annotation to size, to, and tmp2 operands of the
+__clear_user() inline assembly since they are modified or written to before
+the last usage of all input operands. This can lead to incorrect register
+allocation for the inline assembly.
+
+Fixes: 6c2a9e6df604 ("[S390] Use alternative user-copy operations for new hardware.")
+Reported-by: Mark Rutland <mark.rutland@arm.com>
+Link: https://lore.kernel.org/all/20230321122514.1743889-3-mark.rutland@arm.com/
+Cc: stable@vger.kernel.org
+Reviewed-by: Gerald Schaefer <gerald.schaefer@linux.ibm.com>
+Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
+Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/s390/lib/uaccess.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/s390/lib/uaccess.c
++++ b/arch/s390/lib/uaccess.c
+@@ -339,7 +339,7 @@ static inline unsigned long clear_user_m
+ "4: slgr %0,%0\n"
+ "5:\n"
+ EX_TABLE(0b,2b) EX_TABLE(3b,5b)
+- : "+a" (size), "+a" (to), "+a" (tmp1), "=a" (tmp2)
++ : "+&a" (size), "+&a" (to), "+a" (tmp1), "=&a" (tmp2)
+ : "a" (empty_zero_page), "d" (reg0) : "cc", "memory");
+ return size;
+ }
tun-avoid-double-free-in-tun_free_netdev.patch
ocfs2-fix-data-corruption-after-failed-write.patch
bus-imx-weim-fix-branch-condition-evaluates-to-a-gar.patch
-drm-meson-fix-error-handling-when-afbcd.ops-init-fai.patch
-drm-meson-fix-missing-component-unbind-on-bind-error.patch
md-avoid-signed-overflow-in-slot_store.patch
alsa-asihpi-check-pao-in-control_message.patch
alsa-hda-ca0132-fixup-buffer-overrun-at-tuning_ctl_s.patch
alsa-hda-conexant-partial-revert-of-a-quirk-for-lenovo.patch
alsa-usb-audio-fix-regression-on-detection-of-roland-vs-100.patch
drm-etnaviv-fix-reference-leak-when-mmaping-imported-buffer.patch
+s390-uaccess-add-missing-earlyclobber-annotations-to-__clear_user.patch
+usb-host-ohci-pxa27x-fix-and-vs-typo.patch
--- /dev/null
+From 0709831a50d31b3caf2237e8d7fe89e15b0d919d Mon Sep 17 00:00:00 2001
+From: Dan Carpenter <dan.carpenter@oracle.com>
+Date: Sat, 17 Aug 2019 09:55:20 +0300
+Subject: usb: host: ohci-pxa27x: Fix and & vs | typo
+
+From: Dan Carpenter <dan.carpenter@oracle.com>
+
+commit 0709831a50d31b3caf2237e8d7fe89e15b0d919d upstream.
+
+The code is supposed to clear the RH_A_NPS and RH_A_PSM bits, but it's
+a no-op because of the & vs | typo. This bug predates git and it was
+only discovered using static analysis so it must not affect too many
+people in real life.
+
+Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
+Acked-by: Alan Stern <stern@rowland.harvard.edu>
+Link: https://lore.kernel.org/r/20190817065520.GA29951@mwanda
+Signed-off-by: Nobuhiro Iwamatsu (CIP) <nobuhiro1.iwamatsu@toshiba.co.jp>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/usb/host/ohci-pxa27x.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/usb/host/ohci-pxa27x.c
++++ b/drivers/usb/host/ohci-pxa27x.c
+@@ -148,7 +148,7 @@ static int pxa27x_ohci_select_pmm(struct
+ uhcrhda |= RH_A_NPS;
+ break;
+ case PMM_GLOBAL_MODE:
+- uhcrhda &= ~(RH_A_NPS & RH_A_PSM);
++ uhcrhda &= ~(RH_A_NPS | RH_A_PSM);
+ break;
+ case PMM_PERPORT_MODE:
+ uhcrhda &= ~(RH_A_NPS);
projects / thirdparty / kernel / stable-queue.git / commitdiff
