From nobody Mon Jan 02 18:20:50 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 4Nm41H07yrz2p9x0; Mon, 2 Jan 2023 18:20:51 +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 4Nm41G6gBcz3jdZ; Mon, 2 Jan 2023 18:20:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672683650; 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=sVNaG/zosWPPQ4kJsOY9qG3bAqNyy3BzsORs/mJTB7Y=; b=eb3srpmcCeueqRw8WlM60IZ5N6b64VJfq0RV+7qbbisT2Z3Ars7VWjQMvmc2x2NRFHZKA1 ULuvaKb6Aup0W438y+e6enF5u53UdrrPLeiJkOW6JKb9HJx+bf13V2xLE18EyLi91IyCXb EjDJMc4X4shXxUw3oKQFBn/motBjHBHg0dcqTMV6JGSYrAZrcuNL+Dd8OKnxM3RK7rnt7A BLLNVWvg4JBmOhc4iFrcFRoWmYhO7MSt1JDt3V0ITTBQIVlBXD3+7Hnx6QBHfcE0fnCt09 ycmdX9GF8bQWzBMdIpbOSRSMNjUaxcp2BqncEyAfU3gT5fAf1O3wrTmBYCfeeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672683650; 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=sVNaG/zosWPPQ4kJsOY9qG3bAqNyy3BzsORs/mJTB7Y=; b=verDKw4ES75FaXOOCQg7leLtNHmTaErsCseHjrKCkOYNLIA+UhMi5r5vUbDYzyQZpVkMDB K2T+QjdjNJDo+nA1ajEJHJrrQ8ph46WBVvMsXylPezIO7y0yvYr1UUxOY04uAehIKwagqw dfbt621agsE9/RCQfLfyqIgyBUIf6c7bFFOY46d6dNcXstW1TUCrlFTMIIOSGfmIs9YQP8 e+PXJjNOavq+K2EwMLpry/aWnvLypA34K9kjbr64U6O/BwzHQkeIACaRfdG92StSVpSP4/ 9DwELmg0B9UH//na/ARNe54pjl1oVNXlq6yLQ7fPNRcuhdk03DXici8nykeFUA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1672683650; a=rsa-sha256; cv=none; b=agvciBaUiS5xt5TV/gOHZozEZpdvF4ve1QkbtgJNzIjiNjcz8/g/ZiIEKLQoEvjgxlr6f1 ZdNAnduB/OZXhsvT06SpCJ5ahl3aJRa7K73BHS/GzNQAiSAx3rllqc0dq8C7SGAyZ3a2QJ FBipBDQsdSVUWo1YRdYeizcgCgZaoU5uaGZTA2pfA/X98Vpe4ZaGKO2XqlZXu6jBq5+r0f KKbuAgRiRvzs3gfWkrD+rUG8XSC0X6ZQxMBAm/rC7L4HyycIws/QRwOBlpgn4OByz8zBZk tCiTZ1ZU4IDuoF/IeYWfa2x5nvXyY7w72kzqED2LXL3xRSayMognrAGCxh54Fg== 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 4Nm41G5mGbz1FnC; Mon, 2 Jan 2023 18:20:50 +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 302IKodN095227; Mon, 2 Jan 2023 18:20:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 302IKoad095226; Mon, 2 Jan 2023 18:20:50 GMT (envelope-from git) Date: Mon, 2 Jan 2023 18:20:50 GMT Message-Id: <202301021820.302IKoad095226@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: e3e57edf4aac - main - 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/main X-Git-Reftype: branch X-Git-Commit: e3e57edf4aac05d041ca55ff2f008c6109ef88d5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=e3e57edf4aac05d041ca55ff2f008c6109ef88d5 commit e3e57edf4aac05d041ca55ff2f008c6109ef88d5 Author: Cy Schubert AuthorDate: 2022-12-14 21:41:10 +0000 Commit: Cy Schubert CommitDate: 2023-01-02 18:20:05 +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 MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D37748 --- 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:]]}`