From nobody Wed Feb 1 02:54:21 2023 X-Original-To: dev-commits-src-all@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 4P662Q1fnfz3bq7X; Wed, 1 Feb 2023 02:54:22 +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 4P662Q0h6qz4LRL; Wed, 1 Feb 2023 02:54:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675220062; 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=KLrfrFNnmOYm+uCGMlw28UzHhLsqt2CtIBht4DWpcD8=; b=m4K0cLCUjjbFAO3fci5gAAJDNcbd06wDX9FIxUze8O60462ugZxUhS+l8Evr8Ezlj7E74M TVeOQncnfVXC9CNp3rLFCxCC3jJQ273ZCmmhNAM4p2tdbZPi0HiWUEZyI12P6lAR0bN7su ifv3j/ocobMGFcZRsBDpIJhPQ4AXdOuSwupIuA63wgHE6wwOit+ImdGghue2AoqbZspZu8 aFVVqpjV8ph5hKkSWGDXC1wmsUPFWJEaJit7M8Wlgu9b2hg4JZ5F1iCPd/4Vi2gdZtRol+ aXpSrsSF0wKGni9uo54tgCxzbWSTWoLnLs0wiQdN9y7s1P9MJqMYm5W+Jwf8/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675220062; 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=KLrfrFNnmOYm+uCGMlw28UzHhLsqt2CtIBht4DWpcD8=; b=f3FVq8GU0We01YIHBD8lmkEI6af5etDAsfmIL7JXtLgNZiWmR6XuceDAzwfMLgfnRf7eaU 55IR/ZJndNHn9pWR3rQJjJNuqThXYHh7bTv8U/kXvJrNFTh4H/l3AIFypcaYxN/xM3r8S+ 0fA23nlQIGT8Vfmh+/cMlfkosnpHOFL1C98sF5gKrFaVzAJLVxyd8ek2CnYrAzYjDJVo1w FoRsbHc3Jurtb2/hLgSxMPI8rw2NmokuJtSWWuXGe15JTyi2p87HLLmFMr2arwsmYQ+MUS m8a5/7fpUorI+z6bGINagASiIGkTr7KteA0bz1wOiavqU4jIrjxiQGzT3bpxOQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675220062; a=rsa-sha256; cv=none; b=CZscPhfldP/haZ5fgqNb0XE9g+QnH5qZMPjK7Ovxa0jCYN76SfoFVh2xSfDgy7tpfhXnrY /Zp23viHOiUafgyB0WrLkmJ0c1ZnTMFDazyWb28AHrvYOt7S7uCVWx7IffwCYRDAmCr0Qd Sy3LFhjZ2PaudCZGhjPgGO+4UkdHD4qEOtcycgfeSQGgDQAu4uoS2TgeJfKCTfE0mRhGzc nGxR2jr+nM/o+lLPrwCYcJGG8dHKma4YAMBWwXdw7WR59RSLvy0U8Lh7wbzKGgIAQTTBat k7mWQYfCuimTsGbMsP88nfV4Hqzg/kdbFB8ZSsIc7UVrXeA7dNSspkhlJdQE+Q== 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 4P662P6vSXz1CGv; Wed, 1 Feb 2023 02:54:21 +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 3112sLv8006339; Wed, 1 Feb 2023 02:54:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3112sLKa006338; Wed, 1 Feb 2023 02:54:21 GMT (envelope-from git) Date: Wed, 1 Feb 2023 02:54:21 GMT Message-Id: <202302010254.3112sLKa006338@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 40455909e124 - stable/13 - network.subr: Fix infinite loop List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 40455909e124f41ba4b25194ed9991a1b71dce79 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=40455909e124f41ba4b25194ed9991a1b71dce79 commit 40455909e124f41ba4b25194ed9991a1b71dce79 Author: Cy Schubert AuthorDate: 2022-12-14 21:41:10 +0000 Commit: Cy Schubert CommitDate: 2023-02-01 02:53:11 +0000 network.subr: Fix infinite loop When setting up carp tunnel, using a password consisting of only the characters used as hexadecimal characters, i.e. abc-def, there will be an infinite loop in the shell function ifalias_af_common_handler(). To circumvent this we test for " pass ". PR: 268378 Reported by: jyoung15@gmail.com Differential Revision: https://reviews.freebsd.org/D37748 (cherry picked from commit e3e57edf4aac05d041ca55ff2f008c6109ef88d5) --- libexec/rc/network.subr | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libexec/rc/network.subr b/libexec/rc/network.subr index 76a5b94bc408..29ac06daefb2 100644 --- a/libexec/rc/network.subr +++ b/libexec/rc/network.subr @@ -1049,6 +1049,9 @@ ifalias_af_common_handler() # Process the last component if any. if [ -n "${_tmpargs}" ]; then case $_tmpargs in + ${_af}[[:space:]]pass[[:space:]]*) + ${IFCONFIG_CMD} $_if $_tmpargs $_action && _ret=0 + ;; ${_af}[[:space:]]*[0-9a-fA-F]-*) ifalias_af_common_handler $_if $_af $_action \ `ifalias_expand_addr $_af $_action ${_tmpargs#${_af}[[:space:]]}`