From nobody Thu Sep 19 10:02:27 2024 X-Original-To: dev-commits-src-all@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 4X8WKH4hyqz5Vp02; Thu, 19 Sep 2024 10:02: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4X8WKH4GnTz4TSJ; Thu, 19 Sep 2024 10:02:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726740147; 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=qKiTRbEaaJUGo7tQgRjerBXg/vcE3TJnEniz1I+7z8c=; b=Z0S2UmvGrhiRbF6QZ/2zMLmtKb31MOvVI4i6wWiUSiMpIJK80fxHFQgN3LqSxxk0vVBkw8 7AfVerTugR+Hgfr3vp+Oc/Ar4TbflTGq0p4oKuG5sPaJkOOO78HOt4ODk9q9nIWd2Oqx9n mW6m3ZEhvwpKWJiiWy6GK1Pi0wvNlyJsCIvXQ4fn7auJ3KMQiNF+He7dYwTRn6f45EOrqu R32M/FbacOwefjLdd7evfg0QYM90rNDFPpi1LI/8Wskg8U5Slg8pq37qor/7u/stFEngyE RFaojeZMI2iRtea8WQ1fSXYjIQWTknatFPVVMzrHYXmfinaEZSoTofqIRaPDng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726740147; a=rsa-sha256; cv=none; b=q7mCIjWK3zilILFcV4ekE2nPirOpQZCiDctHF5daRCXCYdPTXuSHB6jdoLfG322FJ6Yb89 cqnASSyFsMU/KPbP48XzTaXtTXvuxmBwEwxdQABs73NwcYOznGu7au0Az14fGU0034QA7n s4cEX6YdAHNwVJsTWdqYKsYztLEpbAYWygNWcyeoTVl/FHKod6i1A8GkNO1jm9pDDwEqha ZrGpcQPVvaRUeMHCeV7Fmer6GksN7RsUuKts30K30hGFrWGHrpggd9N+zH/+s5q+iydjOA fDApsRA3I6zGoQI1h9ORVqYPBSP2yDfEHt3KsxQ5UeccHhgNfqbHD1AIsWRiiQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726740147; 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=qKiTRbEaaJUGo7tQgRjerBXg/vcE3TJnEniz1I+7z8c=; b=gJipmLGNFN232G+3ymfbN4jvAG1NUtCY4wzVbOa3zpWHR8wDyLh/Yis+tQgZwmR4B570hy J5vjm8Sh/tQvIV+TYYFSjMjt9GYwL61qLmC31CpNiYABabpVrjKT64vmeQzDkrZEOIwMWI kvPR8bm3a5ry3NLdTlb4o/OPlae66a12PSEaInGLdrQX3cJMwT6PJknd4SLd52eAEzG9v1 pywQHEvVsSPxUjgtfMh3Oxd0qFGLUmfR6bKaoDO3/1T6iV+QjMcKB7Ch64iWQNlJz1Hj7p up0e5EVrsBtN1t1c95UhXMZ4K1TfxbMH02kLF07Ca7pyXL9mbHUimBLT1PjRGg== 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 4X8WKH3m6wz11lq; Thu, 19 Sep 2024 10:02:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48JA2RCR093169; Thu, 19 Sep 2024 10:02:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48JA2RIo093166; Thu, 19 Sep 2024 10:02:27 GMT (envelope-from git) Date: Thu, 19 Sep 2024 10:02:27 GMT Message-Id: <202409191002.48JA2RIo093166@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 5d045d556b1c - main - syslogd: Ignore getaddrinfo() errors if -ss is specified List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5d045d556b1cfeb1487d49017b536afb3df105d3 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=5d045d556b1cfeb1487d49017b536afb3df105d3 commit 5d045d556b1cfeb1487d49017b536afb3df105d3 Author: Mark Johnston AuthorDate: 2024-09-19 10:00:33 +0000 Commit: Mark Johnston CommitDate: 2024-09-19 10:01:37 +0000 syslogd: Ignore getaddrinfo() errors if -ss is specified This can arise if the jail doesn't have networking configured, and if -ss is specified, syslogd won't listen on port 514 anyway. Add a regression test case for this as well. PR: 238006 MFC after: 1 month --- usr.sbin/syslogd/syslogd.c | 8 ++++++++ usr.sbin/syslogd/tests/syslogd_test.sh | 34 +++++++++++++++++++++++++++++++++- 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/usr.sbin/syslogd/syslogd.c b/usr.sbin/syslogd/syslogd.c index 7770e97e7a2d..12fa61b01bad 100644 --- a/usr.sbin/syslogd/syslogd.c +++ b/usr.sbin/syslogd/syslogd.c @@ -548,6 +548,14 @@ addsock(const char *name, const char *serv, mode_t mode) if (serv == NULL) serv = "syslog"; error = getaddrinfo(name, serv, &hints, &res0); + if (error == EAI_NONAME && name == NULL && SecureMode > 1) { + /* + * If we're in secure mode, we won't open inet sockets anyway. + * This failure can arise legitimately when running in a jail + * without networking. + */ + return; + } if (error) { asprintf(&msgbuf, "getaddrinfo failed for %s%s: %s", name == NULL ? "" : name, serv, diff --git a/usr.sbin/syslogd/tests/syslogd_test.sh b/usr.sbin/syslogd/tests/syslogd_test.sh index e4927868e47f..08e6d76b9ba6 100644 --- a/usr.sbin/syslogd/tests/syslogd_test.sh +++ b/usr.sbin/syslogd/tests/syslogd_test.sh @@ -22,7 +22,13 @@ readonly SYSLOGD_LOCAL_PRIVSOCKET="${PWD}/logpriv.sock" # Start a private syslogd instance. syslogd_start() { - syslogd \ + local jail + + if [ "$1" = "-j" ]; then + jail="jexec $2" + shift 2 + fi + $jail syslogd \ -b ":${SYSLOGD_UDP_PORT}" \ -C \ -d \ @@ -288,6 +294,31 @@ pipe_action_cleanup() syslogd_stop } +atf_test_case "jail_noinet" "cleanup" +jail_noinet_head() +{ + atf_set descr "syslogd -ss can be run in a jail without INET support" + atf_set require.user root +} +jail_noinet_body() +{ + local logfile + + atf_check jail -c name=syslogd_noinet persist + + logfile="${PWD}/jail_noinet.log" + printf "user.debug\t${logfile}\n" > "${SYSLOGD_CONFIG}" + syslogd_start -j syslogd_noinet -ss + + syslogd_log -p user.debug -t "test" -h "${SYSLOGD_LOCAL_SOCKET}" \ + "hello, world" + atf_check -s exit:0 -o match:"test: hello, world" cat "${logfile}" +} +jail_noinet_cleanup() +{ + jail -r syslogd_noinet +} + atf_init_test_cases() { atf_add_test_case "basic" @@ -296,4 +327,5 @@ atf_init_test_cases() atf_add_test_case "host_filter" atf_add_test_case "prop_filter" atf_add_test_case "pipe_action" + atf_add_test_case "jail_noinet" }