From nobody Wed May 20 19:36:42 2026 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 4gLMHG6g6Wz6fJPv for ; Wed, 20 May 2026 19:36:42 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gLMHG3FMqz3S6j for ; Wed, 20 May 2026 19:36:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779305802; 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=eR7S3x15pN2MGePjlNoE6xErNwtlXAfxE1FhXsmiKF0=; b=CcUvSLm29f4kMifd80Kk8FJRZaP2fA6XCiQgFoUOwGdvEavdVnpKNGbwu+k7XOB/KWoRsD C6sCK6XpqE2vC/GyyJTwabjXL4FjQDENP1uc+Kba5FbI3qlacTeX2X5JVTrTziummZ+YJl WubgzqIRMSi0Ab/hk3npkHZiMgIXtWG6N9V1yhg+4t/EOdIufTWBnZr/csNqSGAZ9AmNg5 4lm+v+eI5nDmSzobCFVoOt//Pkodp5pdr5iZZSGJh/sr2DdCCM+pjuRIbdytoU5UOP0bSz FkT81pT5CnhMn89VqVHNeZXotGg91t24WfMZExqNJPdx/+pyv8zbhJlUreGl8A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779305802; a=rsa-sha256; cv=none; b=omWJ6YgbgRLcR8GDviPGRujgKtJXzlMPrWjXNJwjr6cv2ybKcAtZ434jHXnBWW+A27JsT7 NWmztvMC/DvLPblUoxE8R8ZQtf+Kf623pgVXe7rqjtBCtDOiN32BznfaT0yQg0bb+rVrmv W6gAK9dS4Tfe/Pohs9hF3s+jVWZgw/siycerDUvBPf09Dj57e/ABJX3D5VM6z9q8NsmeVo v2TzCAs6MYX9R4VZZ0Ocy/U8ulH+pzbAdp5poaHwyqNPteMU6AJJ51Dm4N8hZVYTRsrgfF KkNfs+d6JeZSOt+uFjrZws8KgnA2ExO27cjIUXYq7hp5IiAWg0enMxnOsVnVIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779305802; 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=eR7S3x15pN2MGePjlNoE6xErNwtlXAfxE1FhXsmiKF0=; b=vXAsDksXTzfGH7gjrVeWf9lLueaUYO60zWGONNcth8DhUZl395llalb6pMilg85cUBaTIz 0FokyICcJoUVnzkzEnBkPp3ZYyj+1ENRlO/fCVesV4zIyOvA8vdmJoX/jU2+ggQky2wEIB BaQP1ndaXnXvyv4GdzEQTNAiLrURVx2yp0NrHD24qOgQIqSzXiJmqSemh838r84BWwjyMY Ym/B4OwKw6rr4xfs0kvbiiqi2Zw+3AyubSgrGcNs1gQ3JqKMsh3mi+cIgwvgMIy1d0EooS MTvDVq2CchkilZHgHYWx0/nyG/AUx9nPzXv6iLYbokigjwidHbqLoWGRflRYvw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gLMHG2SRBz1Drh for ; Wed, 20 May 2026 19:36:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38490 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 20 May 2026 19:36:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: b7d2e445fa26 - stable/15 - bsdinstall: Avoid invoking eval on the wlan SSID list 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: b7d2e445fa2623fa5cd119a505f0184be9aecae6 Auto-Submitted: auto-generated Date: Wed, 20 May 2026 19:36:42 +0000 Message-Id: <6a0e0d4a.38490.36b298cf@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b7d2e445fa2623fa5cd119a505f0184be9aecae6 commit b7d2e445fa2623fa5cd119a505f0184be9aecae6 Author: Mark Johnston AuthorDate: 2026-05-12 14:13:56 +0000 Commit: Mark Johnston CommitDate: 2026-05-20 19:36:01 +0000 bsdinstall: Avoid invoking eval on the wlan SSID list The wlanconfig utility is not careful about handling untrusted network names, which can contain shell metacharacters. Factor network selection into a subroutine and use the `set -- "$@"` trick to build up a list of positional parameters for bsddialog without evaluating them. Approved by: so Security: FreeBSD-SA-26:23.bsdinstall Security: CVE-2026-45255 Reported by: Austin Ralls Reviewed by: dteske, des, asiciliano Differential Revision: https://reviews.freebsd.org/D56973 --- usr.sbin/bsdinstall/scripts/wlanconfig | 47 ++++++++++++++++++++++------------ 1 file changed, 31 insertions(+), 16 deletions(-) diff --git a/usr.sbin/bsdinstall/scripts/wlanconfig b/usr.sbin/bsdinstall/scripts/wlanconfig index 33d94a933f45..aababf76c266 100755 --- a/usr.sbin/bsdinstall/scripts/wlanconfig +++ b/usr.sbin/bsdinstall/scripts/wlanconfig @@ -147,6 +147,34 @@ dialog_country_select() country_set "$regdomain" "$country" } +dialog_network_select() +{ + local ssid flags height width rows prompt + + # Avoid using eval on untrusted data. + set -- + while IFS=$'\t' read -r ssid flags; do + [ -n "$ssid" ] || continue + set -- "$@" "$ssid" "$flags" + done <&1 >&$DIALOG_TERMINAL_PASSTHRU_FD +} + ############################################################ MAIN : > "$BSDINSTALL_TMPETC/wpa_supplicant.conf" @@ -213,27 +241,14 @@ while :; do f_eval_catch -dk SCAN_RESULTS wlanconfig wpa_cli "wpa_cli scan_results" NETWORKS=$( echo "$SCAN_RESULTS" | awk -F '\t' ' - /..:..:..:..:..:../ && $5 { printf "\"%s\"\t\"%s\"\n", $5, $4 } + /..:..:..:..:..:../ && $5 { print $5 "\t" $4 } ' | sort | uniq ) if [ ! "$NETWORKS" ]; then f_dialog_title "$msg_error" f_yesno "No wireless networks were found. Rescan?" && continue else - f_dialog_title "Network Selection" - prompt="Select a wireless network to connect to." - f_dialog_menu_size height width rows "$DIALOG_TITLE" \ - "$DIALOG_BACKTITLE" "$prompt" "" $NETWORKS - NETWORK=$( eval $DIALOG \ - --title \"\$DIALOG_TITLE\" \ - --backtitle \"\$DIALOG_BACKTITLE\" \ - --extra-button \ - --extra-label \"Rescan\" \ - --menu \"\$prompt\" \ - $height $width $rows \ - $NETWORKS \ - 2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD - ) + NETWORK=$( dialog_network_select ) fi retval=$? f_dialog_data_sanitize NETWORK @@ -270,7 +285,7 @@ while :; do done [ "$ENCRYPTION" ] || ENCRYPTION=$( echo "$NETWORKS" | - awk -F '\t' "/^\"$NETWORK\"\t/ { print \$2 }" ) + awk -F '\t' "/^$NETWORK\t/ { print \$2 }" ) if echo "$ENCRYPTION" | grep -q PSK; then PASS=$( $DIALOG \