From: Greg Kroah-Hartman Date: Mon, 21 May 2018 19:54:24 +0000 (+0200) Subject: drop s390 3.18 patches X-Git-Tag: v4.9.102~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c3008d00ff97ab2d56cc910ac38a03863178fcdf;p=thirdparty%2Fkernel%2Fstable-queue.git drop s390 3.18 patches --- diff --git a/queue-3.18/s390-cpum_sf-ensure-sample-frequency-of-perf-event-attributes-is-non-zero.patch b/queue-3.18/s390-cpum_sf-ensure-sample-frequency-of-perf-event-attributes-is-non-zero.patch deleted file mode 100644 index 605cc1fecac..00000000000 --- a/queue-3.18/s390-cpum_sf-ensure-sample-frequency-of-perf-event-attributes-is-non-zero.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 4bbaf2584b86b0772413edeac22ff448f36351b1 Mon Sep 17 00:00:00 2001 -From: Hendrik Brueckner -Date: Thu, 3 May 2018 15:56:15 +0200 -Subject: s390/cpum_sf: ensure sample frequency of perf event attributes is non-zero - -From: Hendrik Brueckner - -commit 4bbaf2584b86b0772413edeac22ff448f36351b1 upstream. - -Correct a trinity finding for the perf_event_open() system call with -a perf event attribute structure that uses a frequency but has the -sampling frequency set to zero. This causes a FP divide exception during -the sample rate initialization for the hardware sampling facility. - -Fixes: 8c069ff4bd606 ("s390/perf: add support for the CPU-Measurement Sampling Facility") -Cc: stable@vger.kernel.org # 3.14+ -Reviewed-by: Heiko Carstens -Signed-off-by: Hendrik Brueckner -Signed-off-by: Martin Schwidefsky -Signed-off-by: Greg Kroah-Hartman - ---- - arch/s390/kernel/perf_cpum_sf.c | 4 ++++ - 1 file changed, 4 insertions(+) - ---- a/arch/s390/kernel/perf_cpum_sf.c -+++ b/arch/s390/kernel/perf_cpum_sf.c -@@ -744,6 +744,10 @@ static int __hw_perf_event_init(struct p - */ - rate = 0; - if (attr->freq) { -+ if (!attr->sample_freq) { -+ err = -EINVAL; -+ goto out; -+ } - rate = freq_to_sample_rate(&si, attr->sample_freq); - rate = hw_limit_rate(&si, rate); - attr->freq = 0; diff --git a/queue-3.18/s390-qdio-don-t-release-memory-in-qdio_setup_irq.patch b/queue-3.18/s390-qdio-don-t-release-memory-in-qdio_setup_irq.patch deleted file mode 100644 index 8f27a772536..00000000000 --- a/queue-3.18/s390-qdio-don-t-release-memory-in-qdio_setup_irq.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 2e68adcd2fb21b7188ba449f0fab3bee2910e500 Mon Sep 17 00:00:00 2001 -From: Julian Wiedmann -Date: Wed, 2 May 2018 08:28:34 +0200 -Subject: s390/qdio: don't release memory in qdio_setup_irq() - -From: Julian Wiedmann - -commit 2e68adcd2fb21b7188ba449f0fab3bee2910e500 upstream. - -Calling qdio_release_memory() on error is just plain wrong. It frees -the main qdio_irq struct, when following code still uses it. - -Also, no other error path in qdio_establish() does this. So trust -callers to clean up via qdio_free() if some step of the QDIO -initialization fails. - -Fixes: 779e6e1c724d ("[S390] qdio: new qdio driver.") -Cc: #v2.6.27+ -Signed-off-by: Julian Wiedmann -Signed-off-by: Martin Schwidefsky -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/s390/cio/qdio_setup.c | 10 ++-------- - 1 file changed, 2 insertions(+), 8 deletions(-) - ---- a/drivers/s390/cio/qdio_setup.c -+++ b/drivers/s390/cio/qdio_setup.c -@@ -459,7 +459,6 @@ int qdio_setup_irq(struct qdio_initializ - { - struct ciw *ciw; - struct qdio_irq *irq_ptr = init_data->cdev->private->qdio_data; -- int rc; - - memset(&irq_ptr->qib, 0, sizeof(irq_ptr->qib)); - memset(&irq_ptr->siga_flag, 0, sizeof(irq_ptr->siga_flag)); -@@ -496,16 +495,14 @@ int qdio_setup_irq(struct qdio_initializ - ciw = ccw_device_get_ciw(init_data->cdev, CIW_TYPE_EQUEUE); - if (!ciw) { - DBF_ERROR("%4x NO EQ", irq_ptr->schid.sch_no); -- rc = -EINVAL; -- goto out_err; -+ return -EINVAL; - } - irq_ptr->equeue = *ciw; - - ciw = ccw_device_get_ciw(init_data->cdev, CIW_TYPE_AQUEUE); - if (!ciw) { - DBF_ERROR("%4x NO AQ", irq_ptr->schid.sch_no); -- rc = -EINVAL; -- goto out_err; -+ return -EINVAL; - } - irq_ptr->aqueue = *ciw; - -@@ -513,9 +510,6 @@ int qdio_setup_irq(struct qdio_initializ - irq_ptr->orig_handler = init_data->cdev->handler; - init_data->cdev->handler = qdio_int_handler; - return 0; --out_err: -- qdio_release_memory(irq_ptr); -- return rc; - } - - void qdio_print_subchannel_info(struct qdio_irq *irq_ptr, diff --git a/queue-3.18/s390-qdio-fix-access-to-uninitialized-qdio_q-fields.patch b/queue-3.18/s390-qdio-fix-access-to-uninitialized-qdio_q-fields.patch deleted file mode 100644 index 5c5bc7f5630..00000000000 --- a/queue-3.18/s390-qdio-fix-access-to-uninitialized-qdio_q-fields.patch +++ /dev/null @@ -1,42 +0,0 @@ -From e521813468f786271a87e78e8644243bead48fad Mon Sep 17 00:00:00 2001 -From: Julian Wiedmann -Date: Wed, 2 May 2018 08:48:43 +0200 -Subject: s390/qdio: fix access to uninitialized qdio_q fields - -From: Julian Wiedmann - -commit e521813468f786271a87e78e8644243bead48fad upstream. - -Ever since CQ/QAOB support was added, calling qdio_free() straight after -qdio_alloc() results in qdio_release_memory() accessing uninitialized -memory (ie. q->u.out.use_cq and q->u.out.aobs). Followed by a -kmem_cache_free() on the random AOB addresses. - -For older kernels that don't have 6e30c549f6ca, the same applies if -qdio_establish() fails in the DEV_STATE_ONLINE check. - -While initializing q->u.out.use_cq would be enough to fix this -particular bug, the more future-proof change is to just zero-alloc the -whole struct. - -Fixes: 104ea556ee7f ("qdio: support asynchronous delivery of storage blocks") -Cc: #v3.2+ -Signed-off-by: Julian Wiedmann -Signed-off-by: Martin Schwidefsky -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/s390/cio/qdio_setup.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/s390/cio/qdio_setup.c -+++ b/drivers/s390/cio/qdio_setup.c -@@ -143,7 +143,7 @@ static int __qdio_allocate_qs(struct qdi - int i; - - for (i = 0; i < nr_queues; i++) { -- q = kmem_cache_alloc(qdio_q_cache, GFP_KERNEL); -+ q = kmem_cache_zalloc(qdio_q_cache, GFP_KERNEL); - if (!q) - return -ENOMEM; - diff --git a/queue-3.18/s390-remove-indirect-branch-from-do_softirq_own_stack.patch b/queue-3.18/s390-remove-indirect-branch-from-do_softirq_own_stack.patch deleted file mode 100644 index 7f486fb5e50..00000000000 --- a/queue-3.18/s390-remove-indirect-branch-from-do_softirq_own_stack.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 9f18fff63cfd6f559daa1eaae60640372c65f84b Mon Sep 17 00:00:00 2001 -From: Martin Schwidefsky -Date: Tue, 24 Apr 2018 11:18:49 +0200 -Subject: s390: remove indirect branch from do_softirq_own_stack - -From: Martin Schwidefsky - -commit 9f18fff63cfd6f559daa1eaae60640372c65f84b upstream. - -The inline assembly to call __do_softirq on the irq stack uses -an indirect branch. This can be replaced with a normal relative -branch. - -Cc: stable@vger.kernel.org # 4.16 -Fixes: f19fbd5ed6 ("s390: introduce execute-trampolines for branches") -Reviewed-by: Hendrik Brueckner -Signed-off-by: Martin Schwidefsky -Signed-off-by: Greg Kroah-Hartman - ---- - arch/s390/kernel/irq.c | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - ---- a/arch/s390/kernel/irq.c -+++ b/arch/s390/kernel/irq.c -@@ -177,10 +177,9 @@ void do_softirq_own_stack(void) - new -= STACK_FRAME_OVERHEAD; - ((struct stack_frame *) new)->back_chain = old; - asm volatile(" la 15,0(%0)\n" -- " basr 14,%2\n" -+ " brasl 14,__do_softirq\n" - " la 15,0(%1)\n" -- : : "a" (new), "a" (old), -- "a" (__do_softirq) -+ : : "a" (new), "a" (old) - : "0", "1", "2", "3", "4", "5", "14", - "cc", "memory" ); - } else { diff --git a/queue-3.18/series b/queue-3.18/series index 8e993f3b6cb..42f0ea3b0cf 100644 --- a/queue-3.18/series +++ b/queue-3.18/series @@ -31,10 +31,6 @@ alsa-control-fix-a-redundant-copy-issue.patch powerpc-don-t-preempt_disable-in-show_cpuinfo.patch tracing-x86-xen-remove-zero-data-size-trace-events-trace_xen_mmu_flush_tlb-_all.patch powerpc-powernv-fix-nvram-sleep-in-invalid-context-when-crashing.patch -s390-qdio-fix-access-to-uninitialized-qdio_q-fields.patch -s390-cpum_sf-ensure-sample-frequency-of-perf-event-attributes-is-non-zero.patch -s390-qdio-don-t-release-memory-in-qdio_setup_irq.patch -s390-remove-indirect-branch-from-do_softirq_own_stack.patch efi-avoid-potential-crashes-fix-the-struct-efi_pci_io_protocol_32-definition-for-mixed-mode.patch arm-8771-1-kprobes-prohibit-kprobes-on-do_undefinstr.patch tick-broadcast-use-for_each_cpu-specially-on-up-kernels.patch