From: Greg Kroah-Hartman Date: Tue, 5 Apr 2022 06:24:34 +0000 (+0200) Subject: drop coredump patch, will fix it up again... X-Git-Tag: v5.17.2~27 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=687be3a60e808683142219bc3cce94e6f1bf75fc;p=thirdparty%2Fkernel%2Fstable-queue.git drop coredump patch, will fix it up again... --- diff --git a/queue-5.16/coredump-remove-the-warn_on-in-dump_vma_snapshot.patch b/queue-5.16/coredump-remove-the-warn_on-in-dump_vma_snapshot.patch deleted file mode 100644 index 96c6d776148..00000000000 --- a/queue-5.16/coredump-remove-the-warn_on-in-dump_vma_snapshot.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 49c1866348f364478a0c4d3dd13fd08bb82d3a5b Mon Sep 17 00:00:00 2001 -From: "Eric W. Biederman" -Date: Tue, 8 Mar 2022 13:01:19 -0600 -Subject: coredump: Remove the WARN_ON in dump_vma_snapshot - -From: Eric W. Biederman - -commit 49c1866348f364478a0c4d3dd13fd08bb82d3a5b upstream. - -The condition is impossible and to the best of my knowledge has never -triggered. - -We are in deep trouble if that conditions happens and we walk past -the end of our allocated array. - -So delete the WARN_ON and the code that makes it look like the kernel -can handle the case of walking past the end of it's vma_meta array. - -Reviewed-by: Jann Horn -Reviewed-by: Kees Cook -Signed-off-by: "Eric W. Biederman" -Signed-off-by: Greg Kroah-Hartman ---- - fs/coredump.c | 5 ----- - 1 file changed, 5 deletions(-) - ---- a/fs/coredump.c -+++ b/fs/coredump.c -@@ -1080,11 +1080,6 @@ int dump_vma_snapshot(struct coredump_pa - - mmap_write_unlock(mm); - -- if (WARN_ON(i != *vma_count)) { -- kvfree(*vma_meta); -- return -EFAULT; -- } -- - for (i = 0; i < *vma_count; i++) { - struct core_vma_metadata *m = (*vma_meta) + i; - diff --git a/queue-5.16/series b/queue-5.16/series index 8f4963de91d..6d0d9a35a9d 100644 --- a/queue-5.16/series +++ b/queue-5.16/series @@ -1011,4 +1011,4 @@ revert-nbd-fix-possible-overflow-on-first_minor-in-nbd_dev_add.patch mmc-rtsx-let-mmc-core-handle-runtime-pm.patch mmc-rtsx-fix-build-errors-warnings-for-unused-variable.patch kvm-x86-mmu-do-compare-and-exchange-of-gpte-via-the-user-address.patch -coredump-remove-the-warn_on-in-dump_vma_snapshot.patch +coredump-snapshot-the-vmas-in-do_coredump.patch diff --git a/queue-5.17/coredump-remove-the-warn_on-in-dump_vma_snapshot.patch b/queue-5.17/coredump-remove-the-warn_on-in-dump_vma_snapshot.patch deleted file mode 100644 index efa899bccaa..00000000000 --- a/queue-5.17/coredump-remove-the-warn_on-in-dump_vma_snapshot.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 49c1866348f364478a0c4d3dd13fd08bb82d3a5b Mon Sep 17 00:00:00 2001 -From: "Eric W. Biederman" -Date: Tue, 8 Mar 2022 13:01:19 -0600 -Subject: coredump: Remove the WARN_ON in dump_vma_snapshot - -From: Eric W. Biederman - -commit 49c1866348f364478a0c4d3dd13fd08bb82d3a5b upstream. - -The condition is impossible and to the best of my knowledge has never -triggered. - -We are in deep trouble if that conditions happens and we walk past -the end of our allocated array. - -So delete the WARN_ON and the code that makes it look like the kernel -can handle the case of walking past the end of it's vma_meta array. - -Reviewed-by: Jann Horn -Reviewed-by: Kees Cook -Signed-off-by: "Eric W. Biederman" -Signed-off-by: Greg Kroah-Hartman ---- - fs/coredump.c | 5 ----- - 1 file changed, 5 deletions(-) - ---- a/fs/coredump.c -+++ b/fs/coredump.c -@@ -1134,11 +1134,6 @@ int dump_vma_snapshot(struct coredump_pa - - mmap_write_unlock(mm); - -- if (WARN_ON(i != *vma_count)) { -- kvfree(*vma_meta); -- return -EFAULT; -- } -- - for (i = 0; i < *vma_count; i++) { - struct core_vma_metadata *m = (*vma_meta) + i; - diff --git a/queue-5.17/series b/queue-5.17/series index c6f87c55fd1..7c7b71a148d 100644 --- a/queue-5.17/series +++ b/queue-5.17/series @@ -1120,4 +1120,4 @@ n64cart-convert-bi_disk-to-bi_bdev-bd_disk-fix-build.patch revert-nbd-fix-possible-overflow-on-first_minor-in-nbd_dev_add.patch mmc-rtsx-let-mmc-core-handle-runtime-pm.patch mmc-rtsx-fix-build-errors-warnings-for-unused-variable.patch -coredump-remove-the-warn_on-in-dump_vma_snapshot.patch +coredump-snapshot-the-vmas-in-do_coredump.patch