From nobody Sun Apr 10 23:13:02 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 2C30D1A8EFBA; Sun, 10 Apr 2022 23:13:03 +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 4Kc77g0n9Qz4dd8; Sun, 10 Apr 2022 23:13:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649632383; 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=6bJtCB6lh7ld5OZlhz99y4/E+uGIO8LAwHYLuV4hseQ=; b=Sq6DG3byYFe0QfdWkayZRYWBf0IR1clc5QvfI/I7O81ghJK7aczz2yDVH3v2V9oTir2Eh4 nER60ofKJJj98E+4EfgPVwJuSO9KZxURolVQvMPVFxxV8Rd4yvvT6Q19CHYSyhyefNImVM p2Td2LOorhVqBwUDfUjNE1LtNOS9gxF3Td6LQPX2ehI0gePmcSTyIbapI2tHUR5KKOJ/kk BfJeA60aVF/WHBlSQhAcus+SaSD6FBP+PAfpMW7WCOCjZOZDoiC/iqZpSxeUdJ7nVscheM fWLhi9izfBipzuEkLf580su05ih5E3G6A5yWxUcVsQOjSyPsei3BX0SBd7fZ8g== 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 EF59217D82; Sun, 10 Apr 2022 23:13:02 +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 23AND290056772; Sun, 10 Apr 2022 23:13:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23AND2wG056771; Sun, 10 Apr 2022 23:13:02 GMT (envelope-from git) Date: Sun, 10 Apr 2022 23:13:02 GMT Message-Id: <202204102313.23AND2wG056771@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: fbc0c2a21b76 - stable/13 - dumpon: proceed without compression if the kernel lacks support 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: fbc0c2a21b761f676050e8769ef6ea498c0ac579 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649632383; 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=6bJtCB6lh7ld5OZlhz99y4/E+uGIO8LAwHYLuV4hseQ=; b=O6lCFUQaDY9bxyGgODfBKoeD60RFZBtsx5VXLm8FM0WunUZl9KP05n53sdRT5yc0Llcf4U A8LOerwHEmAxz9BUPqJsgTAK+RYrKaLSxr4WC8/rMfJWqzwcR1AQl4sX5+Cvpv8ZIZrYe6 W2TVNdS4avdv17xO03QkUly1JDe8UqBGQ8SEcbTOyb5FAKeQTMPv90igYATmf2/pc9rSBi wCLGv4eDh3LFNWov1O2xiDK+ilJSfQwxHZ/2Kcm9OyfXBWRM6k+YqwUsEcWGCug96XEsG6 t7BOH6I+N15bsrxa6KXPI+Bwvo7pUuMZpS5LYoOItQCZgAzU6wC0JW+SPT0w9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649632383; a=rsa-sha256; cv=none; b=V8RvhlIRI6MbiTZVmXzxP+qjcemfhgB+WFDlPzIyYPIGswDTElVrXKUj5p/kQigLDr7Pbi r1YRsMyQVaIdjplja1p9LFmDjxFhMtuZkszDms4hHwdDzt6Txxy7JCqtb9JxMQyOhfKddo gbDxiw3IxfCHHCJqjGL1APG1lEq9Wmusgp5TtpTDMP3zQbxOOlFO0sFaN22EzvSzICZUvQ vr69vXGqM4/QF19SbcQrINmKG4PItp2qZ31nkzWUDpMiRix1Fjw68KRYSAKA/Os/ugyhOw AX8F7yiKFeywPXYe5mo3t991ZNrYgwsbB3ghlM0SQ4AXaUsWpBmARpI6rxE37A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=fbc0c2a21b761f676050e8769ef6ea498c0ac579 commit fbc0c2a21b761f676050e8769ef6ea498c0ac579 Author: Ed Maste AuthorDate: 2022-03-10 18:04:34 +0000 Commit: Ed Maste CommitDate: 2022-04-10 23:12:30 +0000 dumpon: proceed without compression if the kernel lacks support PR: 252554 Reviewed by: markj MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D34520 (cherry picked from commit 2b20327ec9394754c0bac2d83567b972a08e3930) --- sbin/dumpon/dumpon.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sbin/dumpon/dumpon.c b/sbin/dumpon/dumpon.c index 2b710a611af3..e7f1d06ea666 100644 --- a/sbin/dumpon/dumpon.c +++ b/sbin/dumpon/dumpon.c @@ -572,6 +572,15 @@ main(int argc, char *argv[]) error = ioctl(fd, DIOCSKERNELDUMP, kdap); if (error != 0) error = errno; + if (error == EINVAL && (gzip || zstd)) { + /* Retry without compression in case kernel lacks support. */ + kdap->kda_compression = KERNELDUMP_COMP_NONE; + error = ioctl(fd, DIOCSKERNELDUMP, kdap); + if (error == 0) + warnx("Compression disabled; kernel may lack gzip or zstd support."); + else + error = errno; + } explicit_bzero(kdap->kda_encryptedkey, kdap->kda_encryptedkeysize); free(kdap->kda_encryptedkey); explicit_bzero(kdap, sizeof(*kdap));