From nobody Wed Dec 21 01:58:49 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 4NcGnk0fd2z1GDlf; Wed, 21 Dec 2022 01:58:50 +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 4NcGnk0CR8z41VW; Wed, 21 Dec 2022 01:58:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671587930; 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=YYsCnE9hef+N7ptC7qCBiyqwgDWgIXMv8ruwJ1hZw0Q=; b=XRtVAxI0ly8d+M3liogF+0UMz29UZLTW2pnjwJQWQpmTTxj4ndXDHiiac7lBbfnPAq1HR2 BIOjzyih0s+p4HcrbA2UdehCqLHBUcnEIpV/adZwQxRbdWZcoyJXEDp7GYyVFXwDkKjx4n baRm2y4X8opO2/7BCFMFjvmR0ogBhwIhDawj9xZZbbZyuN7C5jBPI+UAYL829zy43EaSg4 YnSuWqHOrYZ14iDQFw1hNjYkKOhIiLpUtxCrQfe20f4JF7qvkOKoCLBHek6Wwep7hb5TMF BtOssGch+6UIHEK4L8+hgaNucCLjKbR+6ZDD1h6SXvzLcGqOsEWcyZHKG1AQ9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671587930; 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=YYsCnE9hef+N7ptC7qCBiyqwgDWgIXMv8ruwJ1hZw0Q=; b=b6OafeNHx1Lon5iWS4a4ctEsXxfK0Vk+UG4oMaPRFdYXzmdEGTsznalrfyGOBADVUTuLaR LQxCwkqalk9Fo/K2oR0i+tjGT+kFe2LxTRiC9i+UvDeTnHoq1H1LPBBQGrhROyYiVzqmHl Cm5gdTsq4SNNC88fA1hxCgr4ToHXGh0/DuPahuCV+4J6zcPWRhjdU4iqIXhjBnkWbhRS5w Ncu0U5+1LMZJF0EarmC3t6KWDgeNUaV4aYuo++LKrr4zRT5s7jTDHcB09GnETgfXEh9XK1 Tz2bLwRxJfZ0XbujXLKwEcC/J0yslRXjXs2Fyr37qsnH/UUzNFMzin781h9wAg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1671587930; a=rsa-sha256; cv=none; b=g1etWykbt4eMar9L7cYLDcK0+DkZDRNvJV8eE2wtNlNv3AC6EEFfssLyAcBMunpdxCEyTg a/S4MTP3sw0/7YiMh72wkURHukmYDu3xO+Mts0GDtsKeEXksqch8gypvg42e4K/Pmd4FPl 0JzjG1di+H1zt2f+c+RbX+hn1CJam12otwPLcA7qfaYq4gXw+tCsMUrG8kY6we+vunpxLd xp0oHPKdBfIz6odNHj0wr2dfiTB6NgyN+4yIgRlnj9ByqURIG1ebgLU/1v21DzyKYkIL+k WYjpN7QFGZd4xCHxdTJ0JY3f0U8sWYblgxTV5jyTNo9PVCsrtdhoa4XfZ8sMng== 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 4NcGnj6MTWzxR6; Wed, 21 Dec 2022 01:58:49 +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 2BL1wn3S036724; Wed, 21 Dec 2022 01:58:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BL1wnxK036723; Wed, 21 Dec 2022 01:58:49 GMT (envelope-from git) Date: Wed, 21 Dec 2022 01:58:49 GMT Message-Id: <202212210158.2BL1wnxK036723@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 21ad3e27fabc - main - jail: Fix output of IPv[46] addresses of DDB `show prison` 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 21ad3e27fabcdc3088be993e67e3bc12bd237398 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=21ad3e27fabcdc3088be993e67e3bc12bd237398 commit 21ad3e27fabcdc3088be993e67e3bc12bd237398 Author: Zhenlei Huang AuthorDate: 2022-12-21 01:53:28 +0000 Commit: Zhenlei Huang CommitDate: 2022-12-21 01:53:28 +0000 jail: Fix output of IPv[46] addresses of DDB `show prison` Reviewed by: melifaro, jamie Approved by: kp (mentor) Fixes: eb8dcdeac22d jail: network epoch protection for IP address lists Differential Revision: https://reviews.freebsd.org/D37732 --- sys/kern/kern_jail.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/kern/kern_jail.c b/sys/kern/kern_jail.c index 705d90aecdf8..c715dbf25977 100644 --- a/sys/kern/kern_jail.c +++ b/sys/kern/kern_jail.c @@ -4919,7 +4919,7 @@ db_show_prison(struct prison *pr) db_printf(" %s %s\n", ii == 0 ? "ip4.addr =" : " ", inet_ntoa_r( - *(const struct in_addr *)PR_IP(pr, ii), + *(const struct in_addr *)PR_IP(pr->pr_addrs[af], ii), ip4buf)); } #endif @@ -4932,7 +4932,7 @@ db_show_prison(struct prison *pr) db_printf(" %s %s\n", ii == 0 ? "ip6.addr =" : " ", ip6_sprintf(ip6buf, - (const struct in6_addr *)PR_IP(pr, ii))); + (const struct in6_addr *)PR_IP(pr->pr_addrs[af], ii))); } #endif }