From nobody Wed Mar 16 16:09:14 2022 X-Original-To: dev-commits-src-main@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 1169E1A33137; Wed, 16 Mar 2022 16:09:15 +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 4KJZwB5ZxNz3wB9; Wed, 16 Mar 2022 16:09:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647446954; 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=VTkbd6lbYv8/uYfAwgsAT/78LW7uL1ECRddyhF8wgGA=; b=bIpKfYcPog6Sc5c5/dpuSwDuZVpbwj1B2xLqC9hlvEfJMrPUjzSqcIfAsxspkV3GTSX3ya Y61q0nYmbmejPy9R8IxDKjUV/9msJarBBMxCS7OpkqDBKf7D92YZBN/4WX/4IQBpB0ondy /l3W+6EkE032WMZ3dKIUfvMZw/mti/nflh423oI7mZElu9E9rg+/hA3jOwzzehVmpJiOG/ QDdnCczzC8ReTVZCZTuuRx+zUtSb0IJ2AkXMrePusmwL+M3bnujN9mEITnnhIiMRFJf5RO RKlTyw9Nh7cGT544FoFs6eZupqBOuLb/JUCE5L+hoGADejNMQE5Z7RAnokaDWQ== 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 9AB7319527; Wed, 16 Mar 2022 16:09:14 +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 22GG9EUI038331; Wed, 16 Mar 2022 16:09:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22GG9EG8038330; Wed, 16 Mar 2022 16:09:14 GMT (envelope-from git) Date: Wed, 16 Mar 2022 16:09:14 GMT Message-Id: <202203161609.22GG9EG8038330@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 2b20327ec939 - main - dumpon: proceed without compression if the kernel lacks support List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 2b20327ec9394754c0bac2d83567b972a08e3930 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647446954; 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=VTkbd6lbYv8/uYfAwgsAT/78LW7uL1ECRddyhF8wgGA=; b=jsLvdkJ5yVG1tYgHVDa1BXd9Q+YawjKx2WwsJD7t8zgO/hVCuXN52PBBEIW1zxDGe3r0aJ Am+q4vq9wDcnhCzkIq3zCgQM/OmXcExDqs8OkXoXI2IhMIP93zcNknadvrZ4h5RsZGj1GW IOq65uDzdSwszX5pLZbqo6RjXeT6Hd3BFJJN2NHM08vOwk9Y9Dau31JLQk681AN8x4HZzh IDw4K9FL8LgGhYOuJSf3XM2YnPIg9Z2Lm+1IlrCiAAKJjFcXdpFBwDNPC8H4Km1WsM+E6o L8BsvVNYMwydVw9dEpJ5G7ipgxwkTnoIFyZ78rUgCAZq/j0Ar9KqF+fTHT9/ZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647446954; a=rsa-sha256; cv=none; b=O8MeJ+VOfcZZA4wicBMz6gXtj0VLeQUbAW12mSjiPnmwh2qllxc/B6Tv5UOjrPRMeKf4C2 LBUqxza6Hzak2XjnO+pI58vhHf5YnJS8zppMLZ/HQwGhav5sHveR3RYi3TulEwuvwrO3xE XHVC2Q9/oYAq4ZPMovFjijOa1XFrBgrgoRRNqkzbd1rLPsDxxIxnZ80bMJ0Wc1M/IqOdx4 GdnrNolY+66wv8pRLafqq1XXbgnQxCIhzH3Ch0/4fs4AgcmID6dIlLWEDeOLwqLbDpWd9e Fmh7zxQPI6TxJ2pCOmGTdrV3QjVANLUS+4A2dSjdsNUfg7rJBrNdt0evGzTr3w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=2b20327ec9394754c0bac2d83567b972a08e3930 commit 2b20327ec9394754c0bac2d83567b972a08e3930 Author: Ed Maste AuthorDate: 2022-03-10 18:04:34 +0000 Commit: Ed Maste CommitDate: 2022-03-16 16:08:28 +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 --- sbin/dumpon/dumpon.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sbin/dumpon/dumpon.c b/sbin/dumpon/dumpon.c index a11f07a01200..7d8f81d5eaaf 100644 --- a/sbin/dumpon/dumpon.c +++ b/sbin/dumpon/dumpon.c @@ -650,6 +650,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));