From nobody Wed Jan 18 21:20:24 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 4NxzF52G1kz2t2Hc; Wed, 18 Jan 2023 21:20:25 +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 4NxzF51QJgz45SG; Wed, 18 Jan 2023 21:20:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674076825; 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=niM/hyAWbme3ihsBSHxqWvN2lsTHagrnuBylqNfKag4=; b=GuWM1JgCzZdQB2/X9al4/oJXjOK00OHHr9jm3BkPHlDZ9rEoq7JQtVy3k+DOuMNZVZ6esm woUK3U9KWeNTHwRkMbiS6W+D8kOQNsQ3Mxl0lHyNQvv2xu8OIFZ2iIhkerYnIs55r6T1rQ usEUMU1cmEfVjJJ4ZqXdFUO8NeXf9XxIjUyI6/Yc4ANppLCUxtF09uvbuQ+68qf7tlZGoC BdVK/EDkrfl3sVL5Y3zJpmG1+M8GaX3VEXPlictgfpnT3a7bSJIZn1aH5zlwtu/oKA2QZn 1lbAVC6VXEDuDy9tZ0x8MU+fUHAB4B84Z7J3z0G1vekLGbMjoigsyNV2xy+ozQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674076825; 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=niM/hyAWbme3ihsBSHxqWvN2lsTHagrnuBylqNfKag4=; b=ogIMRPQ4L6admDTo+n8OgfcjWWnx6Rx3tt1YNtwt7zOsJGt3a5OK6E8aSU6ActhhLk0y0n gxxAs0sLnuya4Iu89iphzYS7N5CY9/on7LReyR5SPsN8x4Efj+re5p2dADmxSFH76NRy0b YsnwHL/7JfsQbdpCKRWJ13rh/rg3wKMnKOUjf4Ld+X2Iw6s9gCcZ9s8uASNvGsRJXBZGvw goWY7fJzJTu72ToVvNlI45M5c9Bn7S+hCyt+o2b+kR64BMN/sLuK6/IhnkLUIu7AzIhC61 C9S+TrxM4+olHiCQnMt5azteY691LflL6lyFZ6u4Wmci9Tuj0r+2t1FSJBmWZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674076825; a=rsa-sha256; cv=none; b=EMn4f/ikDiTTHKcW7UVh/1xDYLwd84/ppb4Li/XogZD0+blhmuF6RGLoKEdvQqDhyoToL5 +EpkMUb0EwRGcasnEueLKMBZhVzbS2HV039Ro0QKT6K0XMe5xGcKuK9NfHmnbRcPv3LMNT J27n1OM+x14zsrZTzLEkxAf17DMW+w6JA5jVw39fbr/tZ7jsk7ROMkrrkBrlkp44u2xR5L YbtitirjBq5GSl9qpMVzL2XRD0jQUUa+l3ikc+9sF70aEVfr7zss9xG1lHlh3sKdgKUbtc YTzeCQkbBIiI1d6p0z2K6qtL/bxUAQBsl1SqfEJ+Pt6OoXD/5ouW0BRkaFf36w== 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 4NxzF50T5szR46; Wed, 18 Jan 2023 21:20:25 +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 30ILKOJP063784; Wed, 18 Jan 2023 21:20:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30ILKOqS063783; Wed, 18 Jan 2023 21:20:24 GMT (envelope-from git) Date: Wed, 18 Jan 2023 21:20:24 GMT Message-Id: <202301182120.30ILKOqS063783@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: b1d10b49e24a - main - if_ipsec(4): handle situations where there are no policy or SADB entry for if 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: b1d10b49e24a4fd3af80f8491cd95bd0766ca1f1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b1d10b49e24a4fd3af80f8491cd95bd0766ca1f1 commit b1d10b49e24a4fd3af80f8491cd95bd0766ca1f1 Author: Konstantin Belousov AuthorDate: 2023-01-17 01:59:56 +0000 Commit: Konstantin Belousov CommitDate: 2023-01-18 21:18:39 +0000 if_ipsec(4): handle situations where there are no policy or SADB entry for if Reviewed by: ae, hselasky Sponsored by: NVIDIA Networking MFC after: 1 week Differential revision: https://reviews.freebsd.org/D38093 --- 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 3952b5edb681..a2f690b4cffb 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