From nobody Tue Feb 28 10:21:02 2023 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 4PQtgL6Jzfz3vH1V; Tue, 28 Feb 2023 10:21:02 +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 4PQtgL5QgNz3t75; Tue, 28 Feb 2023 10:21:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677579662; 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=Mevw0nQGtD4ZLzE7qjPCzTZeFOEgDTsTwG7/7rKdgf0=; b=O6FxjFSZft8ySrwhPidQ/lwfAbVNuGcqHtZPF9u97xx8kRav8GvllvwK792rytr8uML8cA D9Ifxn/khn66kn3zsHGtgA1gtsJ4vfQcK934uNKrb89NxIVmv3W6IE+QLWUa/kB+nmNbZ7 cdswhF7x8JIXjltnKE7Irta24onsczQjpWQwKNWVJ1lVFuu2jeTjFJmRnHmeSn8lh6vC0C ET6uTCnOWa1fvZfEUhpvWKRqCKQkXaFzFRvZ+IlRlTqPlmzoktBgzNQsRAhOaOnWU+zzIN EjTUHZ7a/R1A0dnAC4TzKPFp1RWnKrHhnutKg59WH1Mvf8NB5vnz6kZACrKhJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677579662; 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=Mevw0nQGtD4ZLzE7qjPCzTZeFOEgDTsTwG7/7rKdgf0=; b=InnUEdKw7xUrSjWAQxt2AwJUvdt//gv3o87MSi9p6QG72r7aEjzpSflEcKUc9LD1j+Fq2D OZ82Ldfk0FO8f5nTZ+bfGFR/0kvg6XWZaMDVN2NxKYJnuip7fQ7/eLa0dq28X835WVV6xX 1ftiy6Vxa4a7h0427w/d1Zlqar+6ZfUDugR+rwUymrtgRauMDdngYfBLqPtbiTX4nVgfnA upbV3Z6EjD8PXftuQRGJ6mNpIoTveY1CvX1t1EAdW9tVqf0b+ETRFJ6Iaxc7atXbE7STR6 r1vXRDXh96/7uI8mt3qx5KVDtKd9hYKYScbhh9I2WTxYpi8k0Xyn0epLtIMSeA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677579662; a=rsa-sha256; cv=none; b=MMY3uN6ai+eSPrLTkhFVhELN0TQgCeaFZ1ylYvn8vRRR55KssBo2XOUy032H98ufX8889P tVNJXg/n6gg5fcYwKS7m8Xt5JcBODQ4qH33OEpTjJ9DbYOG14phbd9cCHHmK5/CyBgOzyg TZZjoJUouvszxHmHjNGn3C/+aU4pMsWS0+jgKGt2whJAb24j3znWuNLRKQ4PBdWfY6nf4i PdOsoeO2hijQOE7HPqS8Z+uoQxnroXP+5iHfYnfm9NunY4rehs4kSaO8bYqJ2r35jGMYeL B+mSSqDG9bvoSU0lG7+RQ/OZwXFznLC/kd/MiC0DGkiaj6w43WSDF3H1f3G0oQ== 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 4PQtgL48Mrz13jy; Tue, 28 Feb 2023 10:21:02 +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 31SAL2M3023194; Tue, 28 Feb 2023 10:21:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31SAL2F8023193; Tue, 28 Feb 2023 10:21:02 GMT (envelope-from git) Date: Tue, 28 Feb 2023 10:21:02 GMT Message-Id: <202302281021.31SAL2F8023193@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: 2c33b456ff24 - main - jail: Improve readability 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 2c33b456ff24d04d83690327a777d21a6a0a0a33 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=2c33b456ff24d04d83690327a777d21a6a0a0a33 commit 2c33b456ff24d04d83690327a777d21a6a0a0a33 Author: Zhenlei Huang AuthorDate: 2023-02-28 10:14:07 +0000 Commit: Zhenlei Huang CommitDate: 2023-02-28 10:20:07 +0000 jail: Improve readability No functional change intended. Reviewed by: melifaro Differential Revision: https://reviews.freebsd.org/D37890 --- sys/kern/kern_jail.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/sys/kern/kern_jail.c b/sys/kern/kern_jail.c index ba4fa6ea2ce4..41bd5cdca620 100644 --- a/sys/kern/kern_jail.c +++ b/sys/kern/kern_jail.c @@ -634,7 +634,7 @@ prison_ip_copyin(const pr_family_t af, void *op, uint32_t cnt) * address to connect from. */ if (cnt > 1) - qsort(pip->pr_ip + size, cnt - 1, size, pr_families[af].cmp); + qsort(PR_IP(pip, af, 1), cnt - 1, size, cmp); /* * Check for duplicate addresses and do some simple * zero and broadcast checks. If users give other bogus @@ -663,12 +663,13 @@ prison_ip_copyin(const pr_family_t af, void *op, uint32_t cnt) static void prison_ip_dup(struct prison *ppr, struct prison *pr, const pr_family_t af) { + const struct prison_ip *ppip = ppr->pr_addrs[af]; + struct prison_ip *pip; - if (ppr->pr_addrs[af] != NULL) { - pr->pr_addrs[af] = prison_ip_alloc(af, - ppr->pr_addrs[af]->ips, M_WAITOK); - bcopy(ppr->pr_addrs[af]->pr_ip, pr->pr_addrs[af]->pr_ip, - pr->pr_addrs[af]->ips * pr_families[af].size); + if (ppip != NULL) { + pip = prison_ip_alloc(af, ppip->ips, M_WAITOK); + bcopy(ppip->pr_ip, pip->pr_ip, pip->ips * pr_families[af].size); + pr->pr_addrs[af] = pip; } } @@ -4199,19 +4200,20 @@ static SYSCTL_NODE(_security, OID_AUTO, jail, CTLFLAG_RW | CTLFLAG_MPSAFE, 0, static void prison_ip_copyout(struct prison *pr, const pr_family_t af, void **out, int *len) { + const struct prison_ip *pip; const size_t size = pr_families[af].size; again: mtx_assert(&pr->pr_mtx, MA_OWNED); - if (pr->pr_addrs[af] != NULL) { - if (*len < pr->pr_addrs[af]->ips) { - *len = pr->pr_addrs[af]->ips; + if ((pip = pr->pr_addrs[af]) != NULL) { + if (*len < pip->ips) { + *len = pip->ips; mtx_unlock(&pr->pr_mtx); *out = realloc(*out, *len * size, M_TEMP, M_WAITOK); mtx_lock(&pr->pr_mtx); goto again; } - bcopy(pr->pr_addrs[af]->pr_ip, *out, pr->pr_addrs[af]->ips * size); + bcopy(pip->pr_ip, *out, pip->ips * size); } } #endif