From nobody Tue Jun 21 18:33:01 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 5925E868FBB; Tue, 21 Jun 2022 18:33:01 +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 4LSFWK23Xmz4T0w; Tue, 21 Jun 2022 18:33:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655836381; 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=cJlEeGzD3HfHB/B+XbKzL+kyg1hcGGFAw1YzdQR056c=; b=DrnWrIbdM+xXytWDRIMyCDRg9PWO18PeudtqwVlk56X02NUGfkOoT1hh13A9s4oEgMYfV8 r3nbKRQ6KNAT1C3Dlh8NsGFY2xKfGDutdca3OEb8+BrZEFXhPxakgU9jyULQLr0KQtdYZ1 7czgs2KxoYELBY9WUpptyOTRVkX8DnRNvu7OoElyZFMyox+u3CUrek+yCqwCG9x8l7tdO8 UtYI7ItKdnBy7N/rmF1ZTcKaCKOyANt9e/XoKkqcG+xNZ3O/j2J2V1sD9qZuEk2DCGjD+A B7dn5KMqq9kXKKK+upfGw8fTWz15xApoB8Bz0z40AKXqzZbP8SxxYoCQWxc2/w== 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 268CB16DCE; Tue, 21 Jun 2022 18:33:01 +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 25LIX1E4023612; Tue, 21 Jun 2022 18:33:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25LIX1Me023611; Tue, 21 Jun 2022 18:33:01 GMT (envelope-from git) Date: Tue, 21 Jun 2022 18:33:01 GMT Message-Id: <202206211833.25LIX1Me023611@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Eugene Grosbein Subject: git: 048ce0876f54 - main - adjkerntz(8): detect extra jailed invokation to keep logs clean 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: eugen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 048ce0876f5421f70a6d348479bdeacdd8472bed Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655836381; 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=cJlEeGzD3HfHB/B+XbKzL+kyg1hcGGFAw1YzdQR056c=; b=luWnXy7z7DQsxWBRbuXewY8gG3fuNejEkcmKS6OnJDOmykDyO+ebvalcfy3ekTdRdXlvhI VRkbSbD6fRi1kwnbadf28YzckBIPNNr1yeQoZW3HmUvvg1+L/Hyfxc1AaXr2zNYOSu5NZ7 rX147dWziFh5C7FLf3zsjQ2G5DSVkeaQW7iQaX9+Xhu8t1ZEtEkwCSwqnUz0iDYUG9L3TN GYmblIdbmeVBWz51EKaVpddGozpCG9X4zA+EKE3E1ngg4BDNDI8oIDtg6BVEU2KBpyboQm iQ0JmZ/SnU8BIzfNFNp2mCWPyVybMmwqDnKlM/gfUVAu5b8f3jv5HinXlQN6Gg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655836381; a=rsa-sha256; cv=none; b=quMisR6q6KCngD2URZaLcior1Txur/ZlR1VYjE6IZulQAwIKFvP6ufQGVUH2Gt4KmM9nsg AJ+a4bTkTxd82O3S23mEcBX2tB+JnEecQWnCTyR7kd/gkoeL81bJh62X8Z/nfBJndazdsk 54nZoIRtf23uB3jKvEB4UhABOCIIb1PicVTf50OXjMsSjx4H5RQW9LbgdjpobSzftrhy3s Fsh7EriRm6CUVRDzmPVIPLywwF10BJ/Y3Of35e5XU7ea+pPC1GNNz1F62mqEeUlw4X0OpT GL0n/gjgx9h4wIz3QuPYECHYsr1MEBtr/bpngfKsyhEUQg7Vnlht1a0RrFTobQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=048ce0876f5421f70a6d348479bdeacdd8472bed commit 048ce0876f5421f70a6d348479bdeacdd8472bed Author: Eugene Grosbein AuthorDate: 2022-06-21 18:29:08 +0000 Commit: Eugene Grosbein CommitDate: 2022-06-21 18:32:54 +0000 adjkerntz(8): detect extra jailed invokation to keep logs clean It may happen that "adjkerntz -a" called from jailed root crontab. In that case it spams logs with a line: sysctl(set: "machdep.wall_cmos_clock"): Operation not permitted Be silent in that case. MFC after: 1 month --- sbin/adjkerntz/adjkerntz.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sbin/adjkerntz/adjkerntz.c b/sbin/adjkerntz/adjkerntz.c index e6cadcf7f189..2fde545ebf32 100644 --- a/sbin/adjkerntz/adjkerntz.c +++ b/sbin/adjkerntz/adjkerntz.c @@ -46,6 +46,7 @@ __FBSDID("$FreeBSD$"); * with Garrett Wollman and Bruce Evans fixes. * */ +#include #include #include #include @@ -159,6 +160,12 @@ again: len = sizeof(kern_offset); if (sysctlbyname("machdep.adjkerntz", &kern_offset, &len, NULL, 0) == -1) { + if (errno == EPERM && !init && geteuid() == 0) + /* + * Surplus call from jailed root crontab. + * Avoid spamming logs. + */ + return 1; syslog(LOG_ERR, "sysctl(\"machdep.adjkerntz\"): %m"); return 1; }