From nobody Wed May 20 19:38:56 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 4gLMKs5GNWz6fJlg for ; Wed, 20 May 2026 19:38:57 +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 4gLMKr6kHfz3WrR for ; Wed, 20 May 2026 19:38:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779305937; 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=zybHhfnVFouPFMVXrXzH6TTWWOdMKA1qFwiN3VCbIEI=; b=MHXe3acyEDI2XCSOqMkDWRyL6ow2dxOtT//qwtwKWNR3caiOJghoBuIykhi40vNvjJqSA2 JLidiJTVfHIRNxSgYhXbPYZ2urMoLdEMY0nWEx70Y5+qV1VzWLcwq4kz9PFLi3lO/h/Y2f Lw5c56jfDwyOisIildz099ipSWt6o2+oheeihOCyLG0UuMt+DfqI0SWNv1g1/3IjW8FPol 3uqZ4euhr0W1LfusiZVVclOd9ZECVS6efa6v+/FXivnjpLzvgmUPZzlK1KaIaWcs2ngbCy UF6D1WNxVsIoEcdb1Cccag4YqiI+kFJDgVn3JYAdV1O1dmS5dM2R0d18WMWYMw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779305937; a=rsa-sha256; cv=none; b=RKLUy1YlPD+/gbZvSikpcs17415hwQcI78QHfxq0vDyKCW5CKv0IQa3yW4GtvF04uHdDT4 kWr8HixSjMHYgxCp9c5KD+RR2W4hYo+mdTgB8W6SQzHDYXqvU5OPA0ur4PxcKGkNxcm5gD cTs2M/rX/l/is0zhapzGVzqXZPaf/CUubj0F13vjxXum0rCO5By1KGTeaRGD6C8BFIIb6z gRRY1qwT0TDdoiuy29R76mFgNG6aWfT/DhTsLHXoqmod+0yY1R4rZHwe27Usq1EEWLA+Fx F5HQIq44DbyWWHZRvHd564flFiUiRhE0ye88d/rOwk4JBiwK4U7pdDo3+TMwFA== 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=1779305937; 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=zybHhfnVFouPFMVXrXzH6TTWWOdMKA1qFwiN3VCbIEI=; b=xZyn3IDQ0otwN20F+Q1M/vpN1NwCXnOe1w53xb7sRoYsJy6tmvSaVfdcjAlPfY0JZpeTeg W/MQf6qSve0lPSRHiXYMkp+hmGPuBigDhz7U3d9C6ELqs4gMdEZXsdJLDUx2uGK7wx+i7m VqgbWzpCUT01zRf6nFfdVAopko7JZOGHm6xMz1OmYPoa6JhOArnqnnswcfC5iV075GmRy+ Ov2G8RScMbZaUo6f4vAoljLvVB7oroFA4q4zVO9XXhA8Uu/g/tQ620IB4veUvaLNg2Lnso fvLmV+dmiJW1xowgzDjndacD17uCW1R+SSLE0NgHqYSh5Mr8YLUINXSBXjxckg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gLMKr62tzz1F44 for ; Wed, 20 May 2026 19:38:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 367e5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 20 May 2026 19:38:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 7a2a3a32e0d0 - releng/15.1 - 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/releng/15.1 X-Git-Reftype: branch X-Git-Commit: 7a2a3a32e0d0e94ddeddb2cce47fea940209beaa Auto-Submitted: auto-generated Date: Wed, 20 May 2026 19:38:56 +0000 Message-Id: <6a0e0dd0.367e5.24dd5bf2@gitrepo.freebsd.org> The branch releng/15.1 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=7a2a3a32e0d0e94ddeddb2cce47fea940209beaa commit 7a2a3a32e0d0e94ddeddb2cce47fea940209beaa Author: Mark Johnston AuthorDate: 2026-05-12 14:13:56 +0000 Commit: Mark Johnston CommitDate: 2026-05-20 13:52:00 +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: re 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 \