From nobody Sun Jan 22 09:19:19 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 4P073D1pbmz315LP; Sun, 22 Jan 2023 09:19:20 +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 4P073D0xgjz3Q4t; Sun, 22 Jan 2023 09:19:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674379160; 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=AyRtG9q0Gk629fP0QNIbpNRByJ+FKsTS6YdUk0uhRG8=; b=CzmYt6O5Yizhhl36aXGEYHulfa3F/XJ1esYeSFU68yxM31pujNXN0AKF9jqR3Kv8DHgO+g ZjnQlpVnTCkam+ww3jg3kqUItsVOLIK12BST6NqH1vQ8Qd2w23KwSyM9IFD8Xn4KMzhL3I cFQDi7e6WN/DHQJ1cr2tNf1Tzdy+LzETPHKqsf2ChXvETPxFFjuRx7FfQVc9kHOu8YXqi2 OGRts23c4nrE7/4xPeejF6ZOVfUzt+jVXrVrrZojl7jf5ybBofgYyVHbSPHGjRW/Hj+DRr InWyS/AGTwwsp0KfS2KyQi6vwsUs8PpZQXs69j8DiwYNTscrs5X70zJXtbpVyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674379160; 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=AyRtG9q0Gk629fP0QNIbpNRByJ+FKsTS6YdUk0uhRG8=; b=dVNWYxIYORMDe4ptgPBaAyOxeElVp75Swdq12cdGpIe74yiKEKaH9Ys0NJc/aisWhRySML o5TUBFZDcxJpySXxbWihgeZIAVl4FFsKh2f77O7syjAlWoCF8y+RnN7CuEQ0NWgKGj5Uqf BWomShFfFhrZUG76GZIHUbYlgMhla5KQp9AUrF96F1CBRDcLrK88+CKL8GROTAUnGJohn8 F7BOXjTqb1uvihPUwF2Hii3T+wGHfeU4w9DGEmZp2+9YJ7kmlcJIyAfhKH3RyARSqajMMv U1JgJZ4TXDxL5Ajm/9mm97/wOhSPrsIbBXlObxnwSInTwHF1vnuIjkpjRsA9wQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674379160; a=rsa-sha256; cv=none; b=AjsDdqukuW+MPWqZ5IVd/UbeNtJbqtKDOLiEFNBMdlkDfIuT9zz57Dz4RbJVxRSoaRhaQI By2ie0rkUu/cBIZo/mPKCZQeufHhkeaRn/YHbzg7Tc6eVCIlhLH7i9GJoQmtYQ7258TyCY 7AtNJP/lp+FzfiYYZHeGLlGFoRGAzkg8Sn/FIC6mUZW4L0FX+BFaJhSr6Imx5+IQ/qYUEt Yz/KXyPfEAmSlCMbvP0lfAjER0dWZ7nEs/USLRd38eyNn532dwV+y3we16gFSW2GyRXKW5 2wEuw8ubv+3e14oAGb2buVtTp9aFqmrgdkd4PyHnS66dXt1I+L2KPsdxsUqXeg== 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 4P073C706Szk8w; Sun, 22 Jan 2023 09:19:19 +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 30M9JJDI044280; Sun, 22 Jan 2023 09:19:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30M9JJV9044279; Sun, 22 Jan 2023 09:19:19 GMT (envelope-from git) Date: Sun, 22 Jan 2023 09:19:19 GMT Message-Id: <202301220919.30M9JJV9044279@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: 6b95e2c98bd3 - stable/13 - if_ipsec(4): handle situations where there are no policy or SADB entry for if 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6b95e2c98bd34aeb37baa240924ca703e2ddcabd Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6b95e2c98bd34aeb37baa240924ca703e2ddcabd commit 6b95e2c98bd34aeb37baa240924ca703e2ddcabd Author: Konstantin Belousov AuthorDate: 2023-01-17 01:59:56 +0000 Commit: Konstantin Belousov CommitDate: 2023-01-22 09:18:09 +0000 if_ipsec(4): handle situations where there are no policy or SADB entry for if (cherry picked from commit b1d10b49e24a4fd3af80f8491cd95bd0766ca1f1) --- sys/net/if_ipsec.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sys/net/if_ipsec.c b/sys/net/if_ipsec.c index fa23ddb97231..e830bcc73d6b 100644 --- a/sys/net/if_ipsec.c +++ b/sys/net/if_ipsec.c @@ -666,6 +666,10 @@ ipsec_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) break; } saidx = ipsec_getsaidx(sc, IPSEC_DIR_OUTBOUND, sc->family); + if (saidx == NULL) { + error = ENXIO; + break; + } switch (cmd) { #ifdef INET case SIOCGIFPSRCADDR: @@ -783,6 +787,8 @@ ipsec_set_running(struct ipsec_softc *sc) int localip; saidx = ipsec_getsaidx(sc, IPSEC_DIR_OUTBOUND, sc->family); + if (saidx == NULL) + return; localip = 0; switch (sc->family) { #ifdef INET