[PATCH v8 3/9] coredump: reflow dump helpers a little
Christian Brauner
brauner at kernel.org
Fri May 16 11:25:30 UTC 2025
They look rather messy right now.
Acked-by: Luca Boccassi <luca.boccassi at gmail.com>
Reviewed-by: Jann Horn <jannh at google.com>
Reviewed-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn at canonical.com>
Signed-off-by: Christian Brauner <brauner at kernel.org>
---
fs/coredump.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/fs/coredump.c b/fs/coredump.c
index 47c811d32028..4b9ea455a59c 100644
--- a/fs/coredump.c
+++ b/fs/coredump.c
@@ -864,10 +864,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);
@@ -884,20 +883,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
More information about the Linux-security-module-archive
mailing list