Thread (43 messages) 43 messages, 7 authors, 2025-05-16

Re: [PATCH v7 3/9] coredump: reflow dump helpers a little

From: Alexander Mikhalitsyn <hidden>
Date: 2025-05-15 13:22:53
Also in: linux-fsdevel, linux-security-module, lkml

Am Do., 15. Mai 2025 um 00:04 Uhr schrieb Christian Brauner
[off-list ref]:
They look rather messy right now.

Signed-off-by: Christian Brauner <brauner@kernel.org>
Reviewed-by: Alexander Mikhalitsyn <redacted>
quoted hunk ↗ jump to hunk
---
 fs/coredump.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/fs/coredump.c b/fs/coredump.c
index 0e97c21b35e3..a70929c3585b 100644
--- a/fs/coredump.c
+++ b/fs/coredump.c
@@ -867,10 +867,9 @@ static int __dump_emit(struct coredump_params *cprm, const void *addr, int nr)
        struct file *file = cprm->file;
        loff_t pos = file->f_pos;
        ssize_t n;
+
        if (cprm->written + nr > cprm->limit)
                return 0;
-
-
        if (dump_interrupted())
                return 0;
        n = __kernel_write(file, addr, nr, &pos);
@@ -887,20 +886,21 @@ static int __dump_skip(struct coredump_params *cprm, size_t nr)
 {
        static char zeroes[PAGE_SIZE];
        struct file *file = cprm->file;
+
        if (file->f_mode & FMODE_LSEEK) {
-               if (dump_interrupted() ||
-                   vfs_llseek(file, nr, SEEK_CUR) < 0)
+               if (dump_interrupted() || vfs_llseek(file, nr, SEEK_CUR) < 0)
                        return 0;
                cprm->pos += nr;
                return 1;
-       } else {
-               while (nr > PAGE_SIZE) {
-                       if (!__dump_emit(cprm, zeroes, PAGE_SIZE))
-                               return 0;
-                       nr -= PAGE_SIZE;
-               }
-               return __dump_emit(cprm, zeroes, nr);
        }
+
+       while (nr > PAGE_SIZE) {
+               if (!__dump_emit(cprm, zeroes, PAGE_SIZE))
+                       return 0;
+               nr -= PAGE_SIZE;
+       }
+
+       return __dump_emit(cprm, zeroes, nr);
 }

 int dump_emit(struct coredump_params *cprm, const void *addr, int nr)

--
2.47.2
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help