From nobody Fri Oct 07 17:11:07 2022 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 4MkZZz3fH4z4V1Tj; Fri, 7 Oct 2022 17:11:07 +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 4MkZZz39Rjz3Hc5; Fri, 7 Oct 2022 17:11:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665162667; 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=S8TKxguqgfNCi0aMZ8iLV6oTWa7rR7FD2HQO6jrCyXI=; b=pFj0q69KLIa1tn66nnCg/tc+AQFg82luUW+OaNVBsNkmJFDuMBksqEP1Neo/H++FiTTG8j uvE79Bm06dDKJCI5OZDKzaQs5qWUtTGIt2iABF0aM7IjGvFgJN8dqcxQCEHgzSjPb6T0B6 rQKKqAr9KTBh9npLwJ0OrYLPBLhx2gsTXEQVNW6jVQC76WmXp10qzBXiwRj1utyzJ8/itL 1Fi45yndlAqaU5zFrA+YZup0Kd8GhwFBP1rWAeTEmt8vxYZ8d7j+FwlHUCg6ddIEZm74Ua PYYzEUrZPfLvvbic3i5WihtFnpyd/RmRnNPPZAZZN5KMBc7zjpfhpQi9c3ifRg== 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 4MkZZz2DHjzg18; Fri, 7 Oct 2022 17:11:07 +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 297HB77h083414; Fri, 7 Oct 2022 17:11:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 297HB7SI083413; Fri, 7 Oct 2022 17:11:07 GMT (envelope-from git) Date: Fri, 7 Oct 2022 17:11:07 GMT Message-Id: <202210071711.297HB7SI083413@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 61ab88d87330 - main - if_ovpn: remove an incorrect assertion 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 61ab88d873301f8cec91729a312c322e11422f46 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665162667; 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=S8TKxguqgfNCi0aMZ8iLV6oTWa7rR7FD2HQO6jrCyXI=; b=Clu/T+5MGyi7fTdHsUw2a6HL2GK6LXRxYo15yGkj0pv8a7cFo4IjHWAPpifDIbumI93pfP OsutO9C/bvO55mjd1w70qWt3atfPvSdYy7u6+Ui+tyQQGrXumzdNZFFO14vUCAAJlvj23n RDY3jF6woOSaM4kGxwB7/TWmBpjJn/LFtfosI5zhdJLUn/NSZmnIh/oLwmurxcOBuQRVGj 2GMtTkOoP1BHDZ3jNKWPEI72o7xWYY1r/AcmPkRv16q7/XvfM5BxctKzsmZjvCg21QirYk icCS2jP93r7vNl+AAojdRqRzCcEyWfEGMKHXDBYUmJ+vEOuKJ6upl3rlxVWaww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665162667; a=rsa-sha256; cv=none; b=Ej74L5zS0uyA4Two2blVl5ZNbMK1QEluwKXd7iG3H6iCwobEYM02hP8fQ6irpy77rWE7dv vpMWtPhkcvo9i2ADGjaA2KCpLA80R1a7T4kVkiG3ZGLWy1ga0uS/M8GhrkwpND4g/qP6bb SKTMWhhEqd26ePDgn/2Nio0MbBXSAe1pkyVy4Apy3lQdK1Z6RZWlDOenuMU+jDADXSbPy+ USL/fx4xo/kTrb0sHq53/LE2dezhdOjXuTtVM7gUFunMfIFsub9mv88ghf59hg2xUW4Sbs QddmsK8cSDr/PlCfE6daHoYGNtj63XiZSEDR5OghjfeXDUR+7q9Dh2eY3f+IFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=61ab88d873301f8cec91729a312c322e11422f46 commit 61ab88d873301f8cec91729a312c322e11422f46 Author: Kristof Provost AuthorDate: 2022-10-07 17:10:01 +0000 Commit: Kristof Provost CommitDate: 2022-10-07 17:10:01 +0000 if_ovpn: remove an incorrect assertion netisr_dispatch() can fail, especially when under high traffic loads. This isn't a fatal error, so simply don't check the return value. Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/net/if_ovpn.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sys/net/if_ovpn.c b/sys/net/if_ovpn.c index 16def82c6071..55da53ae3eb6 100644 --- a/sys/net/if_ovpn.c +++ b/sys/net/if_ovpn.c @@ -1419,7 +1419,6 @@ ovpn_finish_rx(struct ovpn_softc *sc, struct mbuf *m, struct rm_priotracker *_ovpn_lock_trackerp) { uint32_t af; - int ret __diagused; OVPN_RASSERT(sc); NET_EPOCH_ASSERT(); @@ -1461,9 +1460,7 @@ ovpn_finish_rx(struct ovpn_softc *sc, struct mbuf *m, af = ovpn_get_af(m); if (af != 0) { BPF_MTAP2(sc->ifp, &af, sizeof(af), m); - ret = netisr_dispatch(af == AF_INET ? NETISR_IP : NETISR_IPV6, - m); - MPASS(ret == 0); + netisr_dispatch(af == AF_INET ? NETISR_IP : NETISR_IPV6, m); } else { OVPN_COUNTER_ADD(sc, lost_data_pkts_in, 1); m_freem(m);