From: Greg Kroah-Hartman Date: Mon, 18 May 2020 15:30:51 +0000 (+0200) Subject: drop queue-4.14/clk-unlink-clock-if-failed-to-prepare-or-enable.patch queue-4.9/clk... X-Git-Tag: v4.4.224~9 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=99a76173dbb318f0c52f25f3a8914dd9e75243e2;p=thirdparty%2Fkernel%2Fstable-queue.git drop queue-4.14/clk-unlink-clock-if-failed-to-prepare-or-enable.patch queue-4.9/clk-unlink-clock-if-failed-to-prepare-or-enable.patch --- diff --git a/queue-4.14/clk-unlink-clock-if-failed-to-prepare-or-enable.patch b/queue-4.14/clk-unlink-clock-if-failed-to-prepare-or-enable.patch deleted file mode 100644 index 16134538ca6..00000000000 --- a/queue-4.14/clk-unlink-clock-if-failed-to-prepare-or-enable.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 018d4671b9bbd4a5c55cf6eab3e1dbc70a50b66e Mon Sep 17 00:00:00 2001 -From: Marc Zyngier -Date: Tue, 5 May 2020 15:09:53 +0100 -Subject: clk: Unlink clock if failed to prepare or enable - -From: Marc Zyngier - -commit 018d4671b9bbd4a5c55cf6eab3e1dbc70a50b66e upstream. - -On failing to prepare or enable a clock, remove the core structure -from the list it has been inserted as it is about to be freed. - -This otherwise leads to random crashes when subsequent clocks get -registered, during which parsing of the clock tree becomes adventurous. - -Observed with QEMU's RPi-3 emulation. - -Fixes: 12ead77432f2 ("clk: Don't try to enable critical clocks if prepare failed") -Signed-off-by: Marc Zyngier -Cc: Guenter Roeck -Cc: Stephen Boyd -Cc: Michael Turquette -Link: https://lkml.kernel.org/r/20200505140953.409430-1-maz@kernel.org -Signed-off-by: Stephen Boyd -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/clk/clk.c | 3 +++ - 1 file changed, 3 insertions(+) - ---- a/drivers/clk/clk.c -+++ b/drivers/clk/clk.c -@@ -2780,6 +2780,9 @@ void clk_unregister(struct clk *clk) - __func__, clk->core->name); - kref_put(&clk->core->ref, __clk_release); - unlock: -+ if (ret) -+ hlist_del_init(&core->child_node); -+ - clk_prepare_unlock(); - } - EXPORT_SYMBOL_GPL(clk_unregister); diff --git a/queue-4.14/series b/queue-4.14/series index 0897a64c973..b4b625b6d6f 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -106,7 +106,6 @@ usb-gadget-audio-fix-a-missing-error-return-value-in-audio_bind.patch usb-gadget-legacy-fix-error-return-code-in-gncm_bind.patch usb-gadget-legacy-fix-error-return-code-in-cdc_bind.patch revert-alsa-hda-realtek-fix-pop-noise-on-alc225.patch -clk-unlink-clock-if-failed-to-prepare-or-enable.patch arm64-dts-rockchip-replace-rk805-pmic-node-name-with-pmic-on-rk3328-boards.patch arm64-dts-rockchip-rename-dwc3-device-nodes-on-rk3399-to-make-dtc-happy.patch arm-dts-r8a73a4-add-missing-cmt1-interrupts.patch diff --git a/queue-4.9/clk-unlink-clock-if-failed-to-prepare-or-enable.patch b/queue-4.9/clk-unlink-clock-if-failed-to-prepare-or-enable.patch deleted file mode 100644 index ff76e24abb3..00000000000 --- a/queue-4.9/clk-unlink-clock-if-failed-to-prepare-or-enable.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 018d4671b9bbd4a5c55cf6eab3e1dbc70a50b66e Mon Sep 17 00:00:00 2001 -From: Marc Zyngier -Date: Tue, 5 May 2020 15:09:53 +0100 -Subject: clk: Unlink clock if failed to prepare or enable - -From: Marc Zyngier - -commit 018d4671b9bbd4a5c55cf6eab3e1dbc70a50b66e upstream. - -On failing to prepare or enable a clock, remove the core structure -from the list it has been inserted as it is about to be freed. - -This otherwise leads to random crashes when subsequent clocks get -registered, during which parsing of the clock tree becomes adventurous. - -Observed with QEMU's RPi-3 emulation. - -Fixes: 12ead77432f2 ("clk: Don't try to enable critical clocks if prepare failed") -Signed-off-by: Marc Zyngier -Cc: Guenter Roeck -Cc: Stephen Boyd -Cc: Michael Turquette -Link: https://lkml.kernel.org/r/20200505140953.409430-1-maz@kernel.org -Signed-off-by: Stephen Boyd -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/clk/clk.c | 3 +++ - 1 file changed, 3 insertions(+) - ---- a/drivers/clk/clk.c -+++ b/drivers/clk/clk.c -@@ -2746,6 +2746,9 @@ void clk_unregister(struct clk *clk) - __func__, clk->core->name); - kref_put(&clk->core->ref, __clk_release); - unlock: -+ if (ret) -+ hlist_del_init(&core->child_node); -+ - clk_prepare_unlock(); - } - EXPORT_SYMBOL_GPL(clk_unregister); diff --git a/queue-4.9/series b/queue-4.9/series index de953207450..2b7e86955a0 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -84,7 +84,6 @@ usb-gadget-audio-fix-a-missing-error-return-value-in-audio_bind.patch usb-gadget-legacy-fix-error-return-code-in-gncm_bind.patch usb-gadget-legacy-fix-error-return-code-in-cdc_bind.patch revert-alsa-hda-realtek-fix-pop-noise-on-alc225.patch -clk-unlink-clock-if-failed-to-prepare-or-enable.patch arm-dts-r8a73a4-add-missing-cmt1-interrupts.patch arm-dts-r8a7740-add-missing-extal2-to-cpg-node.patch kvm-x86-fix-off-by-one-error-in-kvm_vcpu_ioctl_x86_setup_mce.patch