From nobody Tue Apr 21 13:28:19 2026 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 4g0NTb4Jqrz679X4 for ; Tue, 21 Apr 2026 13:28:19 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g0NTb3R4Mz3p87 for ; Tue, 21 Apr 2026 13:28:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776778099; 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=DWed4Bw8denmfa7BVDJIclxfGXydC386CwEemkVc9zg=; b=D4gpGwh9BjIBT8i2ngjQmA+NdgeC81LZHuUdv/GYFSRLfopWyor6o1qs8vJ18R2a8cJGN7 1YOxGMGQ6tKQ48PmFBg96hYxX2tzwYqhUqRfq4kLbJcv8MRbRD1IPMediGD987c2r3+xlQ ffrowElezmKWyNdtI568A/NSX5992j9kLH1/toFmoTVl0UTbFG3UuYzdQlb4Od+phuE1cC zd1FP0Js0285jk5dI+3edQqTMKzO0MKrPBWIYal6OdWXxSzdifYGOsvdSM20JkFIw1gzGw eZS5ZSsIA7DTqpACEJQwk31Vi8tCeQ+Cos2BQc6Y5UKs+RHdPzYpT7lO3ZoT5Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776778099; a=rsa-sha256; cv=none; b=v4npJANwaOcusFidNxZiv9KTW9bdm2ZeP5GzRETXUt9LSsSoqJ47MphNfv5axpn4a9xtGk RYOCgeeUF4W+DOiW8PYrjSBuuKINZ4qxi+Ft9/IMICGzU/tMlZpFXtdcOz37zM86lzKEM0 vWNh6ATyWswtmGdjWiAYfu18kR+8p+57hjSZjDqo6IyZWmDW8YsSuphgy3Legae8qtgtSf tCvokfO0MNNgnV5nJWt+bcg6D/rCHh+jsu5kOyWbtwj7hbqobJmKFaQvjyn1DX/JIx9rnX +YXzYNyJRCA9ESufBQ87I8hi5S4rjiVPSlcFAt6V1h2G6jIK3k1ovIyD72yG8g== 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=1776778099; 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=DWed4Bw8denmfa7BVDJIclxfGXydC386CwEemkVc9zg=; b=NHn0S2wj7iDLswhwLq6VKQdjepYuLxyK7EGBRrBdRGEtdoehCWK6ECBD8aux2XRdfFHIOW rHoB9zLL4UcFnf8CVbPMsczRnL7bNtPLgdZ56PAYinvIt+uRhHtJONAAW4xV1nmP5fDeDv QdkHg2ct3IJozD0cMZoAk439FXqd9hiHC07QCrZHabZEntRoAnXd9OzsQc/Cr2C0R7mZF7 NcfC2Lk5LsM/mKvkRuCbRT6Avc7RUYWNT0KGhr1Y4I3UjT13w21DELSF9E5moIx74Hsymf cQhUWLPJUpXE9JpLwy/Xqsb1GPnktignxdoDHn5cUg3PDOzk58beF89t1LpE4g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g0NTb2N6VzmR2 for ; Tue, 21 Apr 2026 13:28:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e1de by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 21 Apr 2026 13:28:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Gallatin Subject: git: 16de94eaf09b - main - audit: Fix logging of IPv6 addresses 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gallatin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 16de94eaf09b75a9a1e90254a6fe5812f55f4cab Auto-Submitted: auto-generated Date: Tue, 21 Apr 2026 13:28:19 +0000 Message-Id: <69e77b73.1e1de.18c989ff@gitrepo.freebsd.org> The branch main has been updated by gallatin: URL: https://cgit.FreeBSD.org/src/commit/?id=16de94eaf09b75a9a1e90254a6fe5812f55f4cab commit 16de94eaf09b75a9a1e90254a6fe5812f55f4cab Author: Andrew Gallatin AuthorDate: 2026-04-20 21:35:46 +0000 Commit: Andrew Gallatin CommitDate: 2026-04-21 13:27:43 +0000 audit: Fix logging of IPv6 addresses - kaudit_to_bsm: Log IPv6 as well as IPv4 and unix addrs - au_to_sock_inet128: Treat ports the same way as au_to_sock_inet32() as just pushing a uint16 causes byte ordering problems on little endian. Differential Revision: https://reviews.freebsd.org/D39633 Sponsored by: Netflix Reviewed by: csjp --- sys/security/audit/audit_bsm.c | 17 +++++++++++++++-- sys/security/audit/bsm_token.c | 2 +- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/sys/security/audit/audit_bsm.c b/sys/security/audit/audit_bsm.c index 6cd96ebe092f..4654b607aea5 100644 --- a/sys/security/audit/audit_bsm.c +++ b/sys/security/audit/audit_bsm.c @@ -542,6 +542,11 @@ kaudit_to_bsm(struct kaudit_record *kar, struct au_record **pau) kau_write(rec, tok); UPATH1_TOKENS; } + if (ARG_IS_VALID(kar, ARG_SADDRINET6)) { + tok = au_to_sock_inet128((struct sockaddr_in6 *) + &ar->ar_arg_sockaddr); + kau_write(rec, tok); + } break; case AUE_BIND: @@ -571,7 +576,11 @@ kaudit_to_bsm(struct kaudit_record *kar, struct au_record **pau) kau_write(rec, tok); UPATH1_TOKENS; } - /* XXX Need to handle ARG_SADDRINET6 */ + if (ARG_IS_VALID(kar, ARG_SADDRINET6)) { + tok = au_to_sock_inet128((struct sockaddr_in6 *) + &ar->ar_arg_sockaddr); + kau_write(rec, tok); + } break; case AUE_BINDAT: @@ -602,7 +611,11 @@ kaudit_to_bsm(struct kaudit_record *kar, struct au_record **pau) kau_write(rec, tok); UPATH1_TOKENS; } - /* XXX Need to handle ARG_SADDRINET6 */ + if (ARG_IS_VALID(kar, ARG_SADDRINET6)) { + tok = au_to_sock_inet128((struct sockaddr_in6 *) + &ar->ar_arg_sockaddr); + kau_write(rec, tok); + } break; case AUE_SOCKET: diff --git a/sys/security/audit/bsm_token.c b/sys/security/audit/bsm_token.c index f704f75c17df..ccf7ab7d2cc8 100644 --- a/sys/security/audit/bsm_token.c +++ b/sys/security/audit/bsm_token.c @@ -1065,7 +1065,7 @@ au_to_sock_inet128(struct sockaddr_in6 *so) ADD_U_CHAR(dptr, 0); ADD_U_CHAR(dptr, so->sin6_family); - ADD_U_INT16(dptr, so->sin6_port); + ADD_MEM(dptr, &so->sin6_port, sizeof(uint16_t)); ADD_MEM(dptr, &so->sin6_addr, 4 * sizeof(uint32_t)); return (t);