From nobody Wed May 20 19:35:50 2026 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 4gLMGG5wcvz6fJLd for ; Wed, 20 May 2026 19:35:50 +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 4gLMGG1SNRz3QMf for ; Wed, 20 May 2026 19:35:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779305750; 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=hRaDYWWc2xS15lLg6zPLOMXGuwpwAcHRUWKZonCJL4U=; b=Fu/Z/8GN3rSNuru/53ukPtTpeA6yo8zDAJFnb6r21cAz0kzr2Te25lMgE9qa11uH2w8IQ7 +qlQpky+8NriGNTsWYG2Uuum6mCDl7uIvRLsYh7DNpbwWCw+5xtKLwbU7guEkWIjXi27Xg 4xGaR5eo74jTAWPsY++FBwE3JITi2dDX9jO8oV/UdVPdglYf8fwA/pMxK94S6Qx6j1z5mI yQ9ZVL8XupUj5FpiEQYgd5Fc4dYJIf1jRsFIdGo3ZoNDn3jqDMtDU+Cpuyk9CdlelZ7ExE fprCglT0P6lTS2XlFoGoEMZw8d/mjSyBs+UGbjaZSoFxOAjQinH1Fh0TQDyjfA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779305750; a=rsa-sha256; cv=none; b=nSGlfbFMdyVtNKnaJqtfFLuvpL8yWmgSZ/d3dd7s69SHwbhUSe3a5O8cLiNDVbl3SjyhDr j6Sz+rryUGRhDdKMgkIal+2T35Dt0Sq4r00dPKXEnUWeE9CcE7aLTV2SJI3OL+LqW7pn0q qLgtUORgizLqjlX0jsi0AC9iyfUB2l/bHmHgUhIQj9cfX8d1XQULe0V67TIJgWGkm14KNV T3X0ZrX4jOsx6u2zvFDmVMx20uOpjHIE1syYcLw6EJOejFXVJg3mwBa2aKgOlb38lTLHhR Khps/ErkoupxCRvg4kJ4EJrquVwXYR9uL18jaxl156SO121BPbXOAd5LYHL9DA== 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=1779305750; 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=hRaDYWWc2xS15lLg6zPLOMXGuwpwAcHRUWKZonCJL4U=; b=s647cYnVI612I1xgyrzZXy5AESytR6EIk/J7NTBPuloY/hYWwur351qB7TYhBjGJJ9T5mN VFNmvkGieBbNel/XQYyElpBaLicPsH4Vy6J+hImaw84BHM24hWLl5cUmqzNxc3b8T9EUuW r2B+nb5lm6TDNrEvDsESg4mPk0ENfN0xkc8Bkm45K98+bXZRZRHF6ZvmEySe14dgJSXVl2 syFTlD4x6uH6tONxWtTqoaK0IXuerybMAJzRicx86td9d9p2sCWIrkfG6IGmH+5wZKN77O RlcVZp93dSoSqXEdQD5aMGMFP/LsDIBqTrhV0KFF6kWTA3YhtKbbABk1Jo9G5Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gLMGG0zJ1z1F3S for ; Wed, 20 May 2026 19:35:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38b8b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 20 May 2026 19:35:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 0f15f5359041 - main - bsdinstall: Avoid invoking eval on the wlan SSID list 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 0f15f5359041ac50090606082a9c46d913ce7d0f Auto-Submitted: auto-generated Date: Wed, 20 May 2026 19:35:50 +0000 Message-Id: <6a0e0d16.38b8b.68b7b5cb@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=0f15f5359041ac50090606082a9c46d913ce7d0f commit 0f15f5359041ac50090606082a9c46d913ce7d0f Author: Mark Johnston AuthorDate: 2026-05-12 14:13:56 +0000 Commit: Mark Johnston CommitDate: 2026-05-20 19:34:50 +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 \