From nobody Mon Feb 14 19:49:26 2022 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 5FCAE19CB4B3; Mon, 14 Feb 2022 19:49:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JyFD71dr4z4b6V; Mon, 14 Feb 2022 19:49:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644868167; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dSFCAD5I6ALB4UoYVbuLUJQyGOyMxMsQ98eYVVmJSdc=; b=ng0fPgYFbPgghbbPwN4AqxrZEIG4cmWPJ50coaM8x2GItxk+vMbX27E/LSoahcr/9FcyWX IErzCE2YiSIE02xcJcKHadRjW4wBErUE4QnNmKHMQXGg2qTdooxUm188rRE1w9MpaDRizw oSq6j1AkUzSzpoxYxk/VU2z2HGqLga2aAaku8scEMNjEnWkBlzVj1eZgLA1zBOCtoU0i8m IuCTFfz8AjJ9itvOr3kdiTOpzcumba0eZAIKXVuqQkP7Raw3/Ub0cl4ve8f3Lq1iilld2i dFnMhjLMcuOP1eSDZDo0oORieQGuBobqyTQ7+KIk4zYBR59YWucPGfBpf7ZRtA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0AFFF147FD; Mon, 14 Feb 2022 19:49:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21EJnQqH036363; Mon, 14 Feb 2022 19:49:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21EJnQII036362; Mon, 14 Feb 2022 19:49:26 GMT (envelope-from git) Date: Mon, 14 Feb 2022 19:49:26 GMT Message-Id: <202202141949.21EJnQII036362@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Justin Hibbits Subject: git: ab298b23f120 - stable/12 - Fix gzip compressed core dumps on big endian architectures List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhibbits X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: ab298b23f1205546ee89aa56f785fc06cbfc46ce Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644868167; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dSFCAD5I6ALB4UoYVbuLUJQyGOyMxMsQ98eYVVmJSdc=; b=nvUXPNl6/9nOYEBTsFW6ibrrpzp6a1yn8y5Qgfn/Bm8Yx1uZ5p1dDkTmo9FWAZfIBC+NF7 XLYNHfSsY/d6EFms/+HpTbYZFnA1XmKuDIYBpnNaWT14naFrtRE2CjM53FWggN04AZWOIC NC8lYdHQ7YMUbdtVwVKYmoCjC2e0k0LWQT+ef0NajcdRSZJk0SlpwfbbcSHpi14pKfgfN0 z/I19Vd13dv80BnT2ChUJMdkxptAEusxERZl+Fc1wRXO/WXOXNvbaG7uUmHh4JqdvYCCqd 4FhVg+jkhEfblUXC9xdnTta/dpZ+NZ+tS9lCRl0RkxxZZ9xcdroQ95uxG5+MDg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644868167; a=rsa-sha256; cv=none; b=KE5Jh238hgmPS54oSmBmKIdlApBKDpQgsTT46FdTFWY6trZAJv/HWGMfuDGpUVXkgdac50 5A38CW8CbnEw3cZIbgRm+iKHGe5go5fIPwnbJ7e3veb2KC1wMWP0PvJ5MjJP3GBY7FCiz2 1TnmyjZ8gm2/zmYo5lMmpUFYk45hHBSm4Ltk+Mn01+LWHwKI+VzBN9IEqPhZG4ZKhQL0W5 SiKpFzdta+kS3kpTLRxNRva3zurCXm1MUhCSiDQ00NUEkTci0fFTatzTyKgMhDIk/EsrYh nDOGXNErn/Ts5awv33cB1V4nW3rjhcWhEsIPGKpbr66+u0FmAjPEBCYOQLFznA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=ab298b23f1205546ee89aa56f785fc06cbfc46ce commit ab298b23f1205546ee89aa56f785fc06cbfc46ce Author: Justin Hibbits AuthorDate: 2022-02-10 15:21:36 +0000 Commit: Justin Hibbits CommitDate: 2022-02-14 19:48:16 +0000 Fix gzip compressed core dumps on big endian architectures The gzip trailer words (size and CRC) are both little-endian per the spec. MFC after: 3 days Sponsored by: Juniper Networks, Inc. (cherry picked from commit 6db44b0158c37f2206f2c4ea7f29f5b774389e54) --- sys/kern/subr_compressor.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/kern/subr_compressor.c b/sys/kern/subr_compressor.c index 551865bc547b..9ca7379100c5 100644 --- a/sys/kern/subr_compressor.c +++ b/sys/kern/subr_compressor.c @@ -41,6 +41,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include #include @@ -195,9 +196,9 @@ gz_write(void *stream, void *data, size_t len, compressor_cb_t cb, * Try to pack as much of the trailer into the * output buffer as we can. */ - ((uint32_t *)trailer)[0] = s->gz_crc; + ((uint32_t *)trailer)[0] = htole32(s->gz_crc); ((uint32_t *)trailer)[1] = - s->gz_stream.total_in; + htole32(s->gz_stream.total_in); room = MIN(sizeof(trailer), s->gz_bufsz - len); memcpy(s->gz_buffer + len, trailer, room);