From nobody Mon Feb 6 22:21:03 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 4P9ghH75m4z3nVRN; Mon, 6 Feb 2023 22:21:03 +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 4P9ghH6Mcpz4Grn; Mon, 6 Feb 2023 22:21:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675722063; 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=zJ+TEA5LO3gZkEeKiJ3mncuXJMUzabk8v+3Mq2SfjIk=; b=IVSN9pup+65EebY/zc+0kptzfxWALztIww94RYkGzh9tn/A+2nrS7WXqDJkAkEjVYmkOqC 1iquXADf1vLOr/37jScXqm458RAVXphbuaZj+5K+uIPSC62w8kkqU82pGo4HMiRZ08x6c8 x/fkU7h9qu3Ikj0Tt1T34uqmk2B/f8SC+/KTOIyQYtjnyP/yZ099ktaIH04o73lPLnxa8N RHcAMsgzXn5Phl1t6nheVk67Af9+N5RXR924pK80JlNKCYoFZfv6VJ+PsZmEhESv+qLiHU drQm6iJm2pi7zDrOHyRa7hP4+aQ+sHYdIbBn8ckO32eq9UsndH1UmpOLbRonUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675722063; 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=zJ+TEA5LO3gZkEeKiJ3mncuXJMUzabk8v+3Mq2SfjIk=; b=b31uDxxNRcAu9iZwgpUvPvX6zVgRVs++/0LPCL8IZgwbe6e1ITtPc8asFNk5WW535gtZz1 q7uLmH7iwn+tMin5y0UjHDPsZcLgQQgvHMmQaRropBwB5WMd+LrxLTdUNsE7NWk5x61XTf X4xTY/JeoLldQviz3bhXyIVbS6ajK3XNYeK1QBROY5ZInY0DX1aTwM3yAHFt1ZjC4ZXRsJ m42FVavV3gsns3ODeaQt6nfUuYxiZNAbSXPoX56TtpjtViXD6MEsyZj02ryF7pNuIKtmrK K8/e/ucHjBvbEPdZQ2pnlHenD+SPulfen6aqggitjBri2beKIberZmqumlp/lw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675722063; a=rsa-sha256; cv=none; b=v+cbpW142ky3ySJokB0z4uCULCACMCwPT0kpMX89HtrDxoSg/BXDUvUQZR57wPvOxf1nEK JWrilDzqdjfTaMVJHrUHHjtxPnv3ljkkii155emKcu5x97KQVsN8sG60uC78sesaRTXRDc groYiJHRYS2LQfpZQ8YPWrMBtllUgbSwhZpsATgS6g5qSnYs+jG97Rep8hbIj1qjFTPWF0 Y7rdMKXfYpf8+7+QV0F+ZdcixcXJV9UULUXe1uZ34pGszTwfYTFqQcUjT186QqJ313X2hq 8F1jLpOIsKYNsdq7Wl3d8M3gG36EU4bmKpAPjVAR5143LMCkVbqHxyH0czchRg== 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 4P9ghH5R2Pzs8r; Mon, 6 Feb 2023 22:21:03 +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 316ML3xX060045; Mon, 6 Feb 2023 22:21:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 316ML3cb060044; Mon, 6 Feb 2023 22:21:03 GMT (envelope-from git) Date: Mon, 6 Feb 2023 22:21:03 GMT Message-Id: <202302062221.316ML3cb060044@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 6cfb1cf3c9d4 - stable/13 - tcp: improve error handling of net.inet.tcp.udp_tunneling_port 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6cfb1cf3c9d4cdf9bc39566f6a94bae4a60096c7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=6cfb1cf3c9d4cdf9bc39566f6a94bae4a60096c7 commit 6cfb1cf3c9d4cdf9bc39566f6a94bae4a60096c7 Author: Michael Tuexen AuthorDate: 2023-01-26 21:55:22 +0000 Commit: Michael Tuexen CommitDate: 2023-02-06 22:17:09 +0000 tcp: improve error handling of net.inet.tcp.udp_tunneling_port In case the new port can't be set, set the port to 0. Sponsored by: Netflix, Inc. (cherry picked from commit e2d14a04c5fc49ad1aab280e3c2e7283bbacc948) --- sys/netinet/tcp_subr.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index 62042df50d18..811e6e10354c 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -843,6 +843,9 @@ sysctl_net_inet_tcp_udp_tunneling_port_check(SYSCTL_HANDLER_ARGS) } if (new != 0) { error = tcp_over_udp_start(); + if (error != 0) { + V_tcp_udp_tunneling_port = 0; + } } } }