From nobody Fri Jul 25 17:39:18 2025 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 4bpZqq23fTz627ZZ; Fri, 25 Jul 2025 17:39: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bpZqp5q2Cz3RyC; Fri, 25 Jul 2025 17:39:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753465158; 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=e7sREEDfKh58NWfRHAH3szrVksC1Y3CYLZd7gyH8WGc=; b=hP+xgMfmC3V0N7f+mFniKxfM5oriIGq/Kn4s26fnQJGvD8Ns05werzNcrTepe89mJdgFPe xKjMFlvtLjwTrFYmE0Y8yx772Q6qixpMfqLeN3PrbpmBj4EPouhdx+a22ZKnEAUFDWjExU 6W9JqzzMtXwvov0254X7Cirm4SQUqVrHAQoHIMv9WmAOkFF5GevDErNVv06s/t8ojf9Qh6 DlyxtEXIfOg2irzSxL1+3q9sal9Ppy3lnPuiau3Zy3l98RFRhJIiffEUAZ1FYcvjvQQwXU PQXF69GsT+7+4yVe3CxPaxDHbGaOlcvfGkHF/14redi8VPl/LZlKxo1a8ED7oA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753465158; 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=e7sREEDfKh58NWfRHAH3szrVksC1Y3CYLZd7gyH8WGc=; b=jwbSS1K9HtB9wzEUXEok5XgIvVdid3N4M8lxMFlTn1LUuV1dy8WPn7UShRU/9sVNrfXd2t mGzw1xTuP7haDqHS+va1bvHNp2oVdTPJfwj6cTIuU6gqsB8vgNKACiJ6oI6b2fbi90eUVs xhDHm8zCR/XJZBpCCVdJOxpufUyLrP5A7R+zf/qmw/OeNSJ9PdAhpltVrmkNCsj/RaTUzk P48q7uk3MFOI54Mixj+lzFN5V8qfspoflL6nNYZij70dJvfoJX1Ydj6+R4PjD9ghnPywAk OuELJJU6zvrMsVZYUouIz4n/mKYmffr0iz5fgJjYymb12v8+SZxC4pCx3MCoMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753465158; a=rsa-sha256; cv=none; b=nBhDqyYIUlFM0O6qEUy2694xr2G9b3SUOg6pmyspn8h4mM732ggG3FwcQvur0WNNvN14ce 4/fd7i2WlvpUStC2mLlo4hbNt6w+wdqRbT/dhL9sPtyYfSJhw1J3KujUPiNPoRWjgUC1ZU alvLIZRuFhQL/OKVocKxiIi3eLv6E7GG9MV074IGBW1jfGyfSvVsia94/EFF1tDac4SAbh bLfQ/XklMddv0AaT/UKbvlKJHFCaToUCNQWZVqVRo27lmLPWe8rCRfJ3RQLc/kpSv7jUdL WLlb5yIGOQ/2PBNXhb6iv2GTwZGAUoWgzWo90us2g/OQbjdnkr8Xm7VczaY98A== 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 4bpZqp4QmPztsV; Fri, 25 Jul 2025 17:39:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56PHdIj7012796; Fri, 25 Jul 2025 17:39:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56PHdI6B012793; Fri, 25 Jul 2025 17:39:18 GMT (envelope-from git) Date: Fri, 25 Jul 2025 17:39:18 GMT Message-Id: <202507251739.56PHdI6B012793@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: a7dfc570f274 - main - if_ovpn: Assert that udp_set_kernel_tunneling() succeeds 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a7dfc570f2747668b2fdd8fde6e1954fcedb2378 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a7dfc570f2747668b2fdd8fde6e1954fcedb2378 commit a7dfc570f2747668b2fdd8fde6e1954fcedb2378 Author: Mark Johnston AuthorDate: 2025-07-25 13:13:52 +0000 Commit: Mark Johnston CommitDate: 2025-07-25 17:39:01 +0000 if_ovpn: Assert that udp_set_kernel_tunneling() succeeds We do this elsewhere, so copy the pattern here. Reviewed by: kp MFC after: 2 weeks Sponsored by: Stormshield Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D51496 --- sys/net/if_ovpn.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/net/if_ovpn.c b/sys/net/if_ovpn.c index 3ff55dc3040d..67530281eefa 100644 --- a/sys/net/if_ovpn.c +++ b/sys/net/if_ovpn.c @@ -635,6 +635,7 @@ ovpn_new_peer(struct ifnet *ifp, const nvlist_t *nvl) * a new one. */ ret = udp_set_kernel_tunneling(sc->so, NULL, NULL, NULL); + MPASS(ret == 0); sorele(sc->so); sc->so = NULL; }