From nobody Wed Jan 18 21:19:02 2023 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 4NxzCV5NTTz2t23Y; Wed, 18 Jan 2023 21:19: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 4NxzCV4vGXz44qF; Wed, 18 Jan 2023 21:19:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674076742; 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=U/k6hEkQcS3omuM8JcgCek6q6E9BV9pJwCbTb3yuXEo=; b=QgqeSHlovzvRZhx7MjjviXci+h/ghH0uq5vLuJl41pcGzNnOzMqTut6bkdlvplnkzyzKmY C4U9+1s6eNvDvH1ua/51dSuCqh/LvmFoER8jbMr+lmSGhp2/FPj4mtNpJh5XghTvYug6FI zqbzuqjOS0a4HCs+b8GCPOgrr+Ucxil1E6qinj73uzJy94QJsXzDiliZcsVw74JLd01K3r XU/QMlMyVck9oUke4f1f811t2+szIOcLDfJ88AvQ9q0XpIgOrVZQBPBEd4zHqB3viwqa3J vbtfMHP7DchbaFit1PnQtFd+Pv7/sdkxah74afFXG6zbLIjZCVVGomXM/IbAmg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674076742; 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=U/k6hEkQcS3omuM8JcgCek6q6E9BV9pJwCbTb3yuXEo=; b=xlinOR9TQix56UY609dc47rw1Rp2WcgE/q+oRsdDsCT5q5b+K7xHE6K2uqljyDnSDaEkxr CS3cF8s3mlpq7OmN8lKEdSd7E5he9qItA6si0qO3CXUthszLdLdMADXUMQiL46L9vbN8AQ SwBf6/U7IYK/r5mjDzBNxGTAummKEXpQH6smxryk92DzEj793drBOi/sPHdp/z62pns6F7 a53ya7LhsBTBD8cBB5i8hvLwygvdoGJh6f+fBmx5FFbApGgcxzRh9x8WslP7B8EER+ldin pOjDQd/03KQXYJK9xYZY54C0Zepbp9efFMmCEeCjX+S7rTMxXZiUgeRB2JG01Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674076742; a=rsa-sha256; cv=none; b=UIsr7bEfHXn8xysXv0GPGAKSFo/dWTKSLKqcRWX3fBikgQvGCnbUNu+V0tfg4bTpsqDXTg DLB8DW/ChqO4P+7sNYpSNgt5Wn5YtSxHpsu8apDcM+tgMOFpDlDI7A9NP147wWtUufrpe6 e6rRNhaN/ZRVDnv0BmiUR9F+pk5kdjUkfx8Fh57t5XsPVtrWN0xA7UPW+XkB1rV+l3+sX/ VQwDNDQqtGQaSWwdy+LOD0JT49BL57h1zqBvdk9X53r3u5QzXQV47xAP3jR18NtSi8Kwr0 r39+DVgcHPHxlCtQM099sBquDStgNvXU+KMZUVFR0DSCi4/yQ/NETu6VPC8x5w== 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 4NxzCV3xN2zQhF; Wed, 18 Jan 2023 21:19: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 30ILJ2AW055115; Wed, 18 Jan 2023 21:19:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30ILJ2cw055114; Wed, 18 Jan 2023 21:19:02 GMT (envelope-from git) Date: Wed, 18 Jan 2023 21:19:02 GMT Message-Id: <202301182119.30ILJ2cw055114@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: eac971545baa - main - if_ipsec(4): protect against user supplying unknown address family 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eac971545baa3857903e0107439f00d8438c5847 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=eac971545baa3857903e0107439f00d8438c5847 commit eac971545baa3857903e0107439f00d8438c5847 Author: Konstantin Belousov AuthorDate: 2023-01-17 01:37:45 +0000 Commit: Konstantin Belousov CommitDate: 2023-01-18 21:18:39 +0000 if_ipsec(4): protect against user supplying unknown address family Reviewed by: ae, hselasky Sponsored by: NVIDIA Networking MFC after: 1 week Differential revision: https://reviews.freebsd.org/D38093 --- sys/net/if_ipsec.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/sys/net/if_ipsec.c b/sys/net/if_ipsec.c index b170ac177a64..3952b5edb681 100644 --- a/sys/net/if_ipsec.c +++ b/sys/net/if_ipsec.c @@ -813,13 +813,17 @@ ipsec_srcaddr(void *arg __unused, const struct sockaddr *sa, { struct ipsec_softc *sc; struct secasindex *saidx; + struct ipsec_iflist *iflist; /* Check that VNET is ready */ if (V_ipsec_idhtbl == NULL) return; NET_EPOCH_ASSERT(); - CK_LIST_FOREACH(sc, ipsec_srchash(sa), srchash) { + iflist = ipsec_srchash(sa); + if (iflist == NULL) + return; + CK_LIST_FOREACH(sc, iflist, srchash) { if (sc->family == 0) continue; saidx = ipsec_getsaidx(sc, IPSEC_DIR_OUTBOUND, sa->sa_family); @@ -1015,12 +1019,18 @@ ipsec_set_tunnel(struct ipsec_softc *sc, struct sockaddr *src, struct sockaddr *dst, uint32_t reqid) { struct epoch_tracker et; + struct ipsec_iflist *iflist; struct secpolicy *sp[IPSEC_SPCOUNT]; int i; sx_assert(&ipsec_ioctl_sx, SA_XLOCKED); /* Allocate SP with new addresses. */ + iflist = ipsec_srchash(src); + if (iflist == NULL) { + sc->ifp->if_drv_flags &= ~IFF_DRV_RUNNING; + return (EAFNOSUPPORT); + } if (ipsec_newpolicies(sc, sp, src, dst, reqid) == 0) { /* Add new policies to SPDB */ if (key_register_ifnet(sp, IPSEC_SPCOUNT) != 0) { @@ -1033,7 +1043,7 @@ ipsec_set_tunnel(struct ipsec_softc *sc, struct sockaddr *src, for (i = 0; i < IPSEC_SPCOUNT; i++) sc->sp[i] = sp[i]; sc->family = src->sa_family; - CK_LIST_INSERT_HEAD(ipsec_srchash(src), sc, srchash); + CK_LIST_INSERT_HEAD(iflist, sc, srchash); } else { sc->ifp->if_drv_flags &= ~IFF_DRV_RUNNING; return (ENOMEM);