From nobody Sun Jan 22 09:19:18 2023 X-Original-To: dev-commits-src-branches@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 4P073C0RJfz3156Z; Sun, 22 Jan 2023 09:19: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P073B6gLNz3Px2; Sun, 22 Jan 2023 09:19:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674379158; 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=klRI3Bm6T3D3aWoi48QqAt/9WXPAYrzjwWPudm1I+xo=; b=SFseV/9al0N6qzmBExrYMBOvMf8oySaFN3XlWZbhNr9bCWKKoDl2eK/ZvdPs0VIjg1q7kl 92G6mt4sHG44j7KsDZnuBJpPCTlPVeRmeRbkaK0TVTM8xKLTEGo9QGMD0Vejtn2w35+s95 PzjDMDhqaJA2GydVGRJgSxxP2fLrM00NbFFpZYgpVs6Wd+Lr9e/rUkNyCltsbm/IO6IFwc d+feynqpNgJ74cmLulAUYmRAmUVOmBmRC3c40GDdcR6nCBMYT/Pse1boQg0F5U2oaP4ewh TwbTR1xgo6FUzdA7QH15kHFy52lzpus/5Bht2hHewXIpR2ttBFER29nAy8RYDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674379158; 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=klRI3Bm6T3D3aWoi48QqAt/9WXPAYrzjwWPudm1I+xo=; b=SWawGpOzWCzXVwEc5hAzYafFG/2q9hu9RoOTsbJ+bBHRw96/rlM+SsbOfrGuLcpZl6BJVY UwHVVpkuGOEI3bv5KnB9Su/OLNwhhT6eIWKO9LyQHfDewWK0tlEe2WWOftEeYkPCg2Z4nF +SdEaieaT+JuWfRUEG0H8+Tlmpvtr7JYVvWRJSVkQZm/HLDFU1fgBsJzAgafDyxZfD85Or mUGCyqijpoMb18ZHa/w1itfI6GwkirlLnTGc/JkKYi3ZaLKbTn8Hx/Yx4FEDC1AkKlHlM2 72ixf9vghvC714ARBBw9Xr7jjSf5cOW4Lllsq4rPSiQmSTi26B6y44AL1+5KdQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674379158; a=rsa-sha256; cv=none; b=K+eM70qnZ/zYl1Jmz5qIyi6xwr9Xjqp6iz4Yuy8255fsLX5hQS/ku1AjcZvfiSGqr/tUw4 WO23hFw4IheyHeTIMKJoCalrkeuKTJkhB4qXKWGUclygPu2ZcOn9Va9nk6y1YDSoCUGj9q CbgqZsrC/ryErC8NP41InzBS7mrA0J8LNn0pWk2qIYxHeWFJVOZlXXOwKjFbcVc/8kSuVj Et8+ATNALyW+wvOL047WbyStkXmQZ+pyg1UHPfKUVP9CBSWtmaT0PMbwZLqn6uiGUVx/xg 2u6DbeLlpd8IpgAFUA0idwNuTeKwUrnnLAJ1f/rOEy/ApT7k3+VV6AkDLxAEVQ== 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 4P073B5mp5zkV6; Sun, 22 Jan 2023 09:19:18 +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 30M9JIrt044251; Sun, 22 Jan 2023 09:19:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30M9JImU044250; Sun, 22 Jan 2023 09:19:18 GMT (envelope-from git) Date: Sun, 22 Jan 2023 09:19:18 GMT Message-Id: <202301220919.30M9JImU044250@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 6a54bc5d9c5c - stable/13 - if_ipsec(4): protect against user supplying unknown address family List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 6a54bc5d9c5c6cd3239e8a13802087729ff14be1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6a54bc5d9c5c6cd3239e8a13802087729ff14be1 commit 6a54bc5d9c5c6cd3239e8a13802087729ff14be1 Author: Konstantin Belousov AuthorDate: 2023-01-17 01:37:45 +0000 Commit: Konstantin Belousov CommitDate: 2023-01-22 09:18:09 +0000 if_ipsec(4): protect against user supplying unknown address family (cherry picked from commit eac971545baa3857903e0107439f00d8438c5847) --- 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 b9931286a735..fa23ddb97231 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); @@ -1014,12 +1018,18 @@ static int ipsec_set_tunnel(struct ipsec_softc *sc, struct sockaddr *src, struct sockaddr *dst, uint32_t reqid) { + 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) { @@ -1032,7 +1042,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);