diff options
| author | Justin Hibbits <jhibbits@FreeBSD.org> | 2021-10-01 18:39:18 +0000 |
|---|---|---|
| committer | Mark Johnston <markj@FreeBSD.org> | 2021-11-29 14:08:11 +0000 |
| commit | 2949655427209b7d086eb35a92ea1e175d1b1a67 (patch) | |
| tree | 1cf31b2944e3dd81c8cfe04da99855dc5574e79d | |
| parent | 141f0db23eff6fe49aa4ee8cc9c84aabc3f3eaa6 (diff) | |
| download | src-2949655427209b7d086eb35a92ea1e175d1b1a67.tar.gz src-2949655427209b7d086eb35a92ea1e175d1b1a67.zip | |
Fix segment size in compressing core dumps
A core segment is bounded in size only by memory size. On 64-bit
architectures this means a segment can be much larger than 4GB.
However, compress_chunk() takes only a u_int, clamping segment size to
4GB-1, resulting in a truncated core. Everything else, including the
compressor internally, uses size_t, so use size_t at the boundary here.
This dates back to the original refactor back in 2015 (r279801 /
aa14e9b7).
PR: 260006
Sponsored by: Juniper Networks, Inc.
(cherry picked from commit 63cb9308a75b99fe057409705bc1b2ac0293f578)
| -rw-r--r-- | sys/kern/imgact_elf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c index e1b6e3fc6ba7..18ddbae57d4a 100644 --- a/sys/kern/imgact_elf.c +++ b/sys/kern/imgact_elf.c @@ -1505,9 +1505,9 @@ static void note_procstat_vmmap(void *, struct sbuf *, size_t *); * Write out a core segment to the compression stream. */ static int -compress_chunk(struct coredump_params *p, char *base, char *buf, u_int len) +compress_chunk(struct coredump_params *p, char *base, char *buf, size_t len) { - u_int chunk_len; + size_t chunk_len; int error; while (len > 0) { |