Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 29 Nov 2021 14:21:25 GMT
From:      Mark Johnston <markj@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: f47775628333 - stable/12 - Fix segment size in compressing core dumps
Message-ID:  <202111291421.1ATELPfM056220@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch stable/12 has been updated by markj:

URL: https://cgit.FreeBSD.org/src/commit/?id=f4777562833311b5b4c99e5dda8d50d91a514bf0

commit f4777562833311b5b4c99e5dda8d50d91a514bf0
Author:     Justin Hibbits <jhibbits@FreeBSD.org>
AuthorDate: 2021-10-01 18:39:18 +0000
Commit:     Mark Johnston <markj@FreeBSD.org>
CommitDate: 2021-11-29 14:21:19 +0000

    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)
---
 sys/kern/imgact_elf.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c
index 416de09630ae..c056cfcec8e0 100644
--- a/sys/kern/imgact_elf.c
+++ b/sys/kern/imgact_elf.c
@@ -1473,9 +1473,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) {



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202111291421.1ATELPfM056220>