[brown paperbag] fix coredump breakage
authorAl Viro <viro@zeniv.linux.org.uk>
Tue, 4 Oct 2022 00:26:08 +0000 (20:26 -0400)
committerAl Viro <viro@zeniv.linux.org.uk>
Tue, 4 Oct 2022 00:28:38 +0000 (20:28 -0400)
Let me count the ways in which I'd screwed up:

* when emitting a page, handling of gaps in coredump should happen
before fetching the current file position.
* fix for a problem that occurs on rather uncommon setups (and hadn't
been observed in the wild) had been sent very late in the cycle.
* ... with badly insufficient testing, introducing an easily
reproducible breakage.  Without giving it time to soak in -next.

Fucked-up-by: Al Viro <viro@zeniv.linux.org.uk>
Reported-by: "J. R. Okajima" <hooanon05g@gmail.com>
Tested-by: "J. R. Okajima" <hooanon05g@gmail.com>
Fixes: 06bbaa6dc53c "[coredump] don't use __kernel_write() on kmap_local_page()"
Cc: stable@kernel.org # v6.0-only
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
fs/coredump.c

index 1ab4f5b76a1e74065f6acd272ef1e75020d4d1f2..3538f3a63965df169906e744a6af9e43dadd1ae0 100644 (file)
@@ -841,7 +841,7 @@ static int dump_emit_page(struct coredump_params *cprm, struct page *page)
        };
        struct iov_iter iter;
        struct file *file = cprm->file;
-       loff_t pos = file->f_pos;
+       loff_t pos;
        ssize_t n;
 
        if (cprm->to_skip) {
@@ -853,6 +853,7 @@ static int dump_emit_page(struct coredump_params *cprm, struct page *page)
                return 0;
        if (dump_interrupted())
                return 0;
+       pos = file->f_pos;
        iov_iter_bvec(&iter, WRITE, &bvec, 1, PAGE_SIZE);
        n = __kernel_write_iter(cprm->file, &iter, &pos);
        if (n != PAGE_SIZE)