From nobody Tue Jun 28 01:03:08 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 2F2D08778BB; Tue, 28 Jun 2022 01:03:09 +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 4LX5th67dpz3D15; Tue, 28 Jun 2022 01:03:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656378188; 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=YdP2mr8MuRLZ21MJ0URCMVyS7ZflPu6S8IWTQ5riduU=; b=TctennXJ/bzbUkhqva2NoPRnbo5n5H1G6KBBAXeKrcK/OBM1XU76pCVJvWkcbvRIW+ONKP SXKhvN1TQ/4ifGDsDjUDoayZO0VEPO3fQjG35mo+t6YSrBudn7JrNCJJahsC6PV312wplV tKJYud3w4k4/OLSC8RrHDhm78wkh+5cg2CoLplzREKXsRGY8VpBowis/cnareVx8rwZhOP CFV/puHPG90zKPdaX4z5Z1pNfrtA1+WhXCmiDEXaXiGlYg6XhgGkAtCLas6p3F3GvtrDge zLoC/hNL9bX282ZMvvNYrJ/E7l7wKTI2plFzwgFSSTOX32yaWXcaBRYa6YQZQA== 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 B2563132DB; Tue, 28 Jun 2022 01:03:08 +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 25S138Tg070335; Tue, 28 Jun 2022 01:03:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25S1389O070334; Tue, 28 Jun 2022 01:03:08 GMT (envelope-from git) Date: Tue, 28 Jun 2022 01:03:08 GMT Message-Id: <202206280103.25S1389O070334@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: ad3ad06477d0 - main - blackhole(4): fix operator precedence 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ad3ad06477d013371b95af673a9776c62f49a97f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656378188; 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=YdP2mr8MuRLZ21MJ0URCMVyS7ZflPu6S8IWTQ5riduU=; b=ZWV2YwCGOwPAtsdfGbouyqU/1d/Yc8xukwQtcFH7/WNCIaYus38TOD79EgMm5YJMMpSs0V iruFy1Y0Kg1tgNn22VhICOvex+k/sFCW19A9uJPKBt22R1Hjo7TX2v6AtOBYyS6+4jfNLt wk4b16LyBkZqbaRSmNlIB1gWHx3QXoXc5DTiqD//G2d6Zojmr/XiuzV4nqXx2nx8Y1wudu OM+23kchdEolvR/32kCUqzsoMnSFCYSz3SAXmS6kdJMtsd/8Ya1kDANSmZVglu6UlLuQY3 EqU1hmBEIbgOyAehTjJjm+ki8qlV1fdMziUUCMtUF58pQAftLMuWExCrZLNdKA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656378188; a=rsa-sha256; cv=none; b=vtEkXsqYzwKQQ7YoBqdiOpN6dunsIEwnT1812OTEDzHladTqGzAWmTy7vTbm5b+EK8s21I LwSf9G+3lMpObwzyDYwpFHnmxSt9kneox0tCwJNyjl9hpBMgMNHtpfqk1fusmRcrlyvXMe x2pT0tfr+rL1jWwYbx2EOgRJ/vxZ3z/WuqqrUTTRdIxw4B4UfqO/oUCy6CiaBG4wqIaOkl e5TuMyFp6vI+nnc7HMb8TQPRT2R0hzBlFS+h9Ya6nGaPj+/9KxFmmCO+7pQWulAbWrXp6k x+BMG6fcKsH+fnzbdDM1hS+dp7OnOGVopTda05XzAtWcn4mEVG3kzv2tdhjhJQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=ad3ad06477d013371b95af673a9776c62f49a97f commit ad3ad06477d013371b95af673a9776c62f49a97f Author: Gleb Smirnoff AuthorDate: 2022-06-28 00:52:19 +0000 Commit: Gleb Smirnoff CommitDate: 2022-06-28 00:52:19 +0000 blackhole(4): fix operator precedence Fixes: 3ea9a7cf7b09a355cde3a76824809402b99d0892 --- sys/netinet/tcp_input.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index 92858291a05b..a51e62616bea 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -919,7 +919,7 @@ findpcb: * completely ignore the segment and drop it. */ if (((V_blackhole == 1 && (thflags & TH_SYN)) || - V_blackhole == 2) && (V_blackhole_local || + V_blackhole == 2) && (V_blackhole_local || ( #ifdef INET6 isipv6 ? !in6_localaddr(&ip6->ip6_src) : #endif @@ -928,7 +928,7 @@ findpcb: #else true #endif - )) + ))) goto dropunlock; rstreason = BANDLIM_RST_CLOSEDPORT;