From b4c0f7adf976be901e136a4e8992ee62b611f7bf Mon Sep 17 00:00:00 2001 From: Oliver Neukum Date: Apr 18 2023 10:57:34 +0000 Subject: usb: typec: Check for ops->exit instead of ops->enter in altmode_exit (git-fixes). --- diff --git a/patches.suse/usb-typec-Check-for-ops-exit-instead-of-ops-enter-in.patch b/patches.suse/usb-typec-Check-for-ops-exit-instead-of-ops-enter-in.patch new file mode 100644 index 0000000..b4e2be6 --- /dev/null +++ b/patches.suse/usb-typec-Check-for-ops-exit-instead-of-ops-enter-in.patch @@ -0,0 +1,39 @@ +From b6ddd180e3d9f92c1e482b3cdeec7dda086b1341 Mon Sep 17 00:00:00 2001 +From: Sven Peter +Date: Mon, 14 Nov 2022 17:59:24 +0100 +Subject: [PATCH] usb: typec: Check for ops->exit instead of ops->enter in + altmode_exit +Git-commit: b6ddd180e3d9f92c1e482b3cdeec7dda086b1341 +References: git-fixes +Patch-mainline: v6.2-rc1 + +typec_altmode_exit checks if ops->enter is not NULL but then calls +ops->exit a few lines below. Fix that and check for the function +pointer it's about to call instead. + +Fixes: 8a37d87d72f0 ("usb: typec: Bus type for alternate modes") +Signed-off-by: Sven Peter +Reviewed-by: Heikki Krogerus +Link: https://lore.kernel.org/r/20221114165924.33487-1-sven@svenpeter.dev +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Oliver Neukum +--- + drivers/usb/typec/bus.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/usb/typec/bus.c b/drivers/usb/typec/bus.c +index 26ea2fdec17d..31c2a3130cad 100644 +--- a/drivers/usb/typec/bus.c ++++ b/drivers/usb/typec/bus.c +@@ -134,7 +134,7 @@ int typec_altmode_exit(struct typec_altmode *adev) + if (!adev || !adev->active) + return 0; + +- if (!pdev->ops || !pdev->ops->enter) ++ if (!pdev->ops || !pdev->ops->exit) + return -EOPNOTSUPP; + + /* Moving to USB Safe State */ +-- +2.40.0 + diff --git a/series.conf b/series.conf index 4c12f1e..bdd3089 100644 --- a/series.conf +++ b/series.conf @@ -63094,6 +63094,7 @@ patches.suse/PCI-sysfs-Fix-double-free-in-error-path.patch patches.suse/crypto-arm64-Fix-unused-variable-compilation-warnings-of-cpu_feature.patch patches.suse/tracing-Fix-infinite-loop-in-tracing_read_pipe-on-overflowed-print_trace_line.patch + patches.suse/usb-typec-Check-for-ops-exit-instead-of-ops-enter-in.patch patches.suse/x86-mm-Randomize-per-cpu-entry-area.patch patches.suse/powerpc-xive-add-missing-iounmap-in-error-path-in-xi.patch patches.suse/powerpc-perf-callchain-validate-kernel-stack-pointer.patch