From nobody Wed May 20 19:38:57 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 4gLMKt1qYHz6fJlh for ; Wed, 20 May 2026 19:38:58 +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 4gLMKt00Ftz3Wrk for ; Wed, 20 May 2026 19:38:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779305938; 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=kTd+88TxeG770QAFj19ST/fNILdB6tyYudgUcF5zooM=; b=fgYANa0rxEAz3ZXNd+sotklr2qsO4I5BuISi2h7NuD/fVUwK8PtSqzqO3/8xGxXr36I0wA kV8KJb3cYMNoZmmLj0wFwLuVFYG3fqZwdYQNvtgNvohNPAuf/Z2drDPP93yAtUpVa7F62N Cz5ap3iKrciBocD0/wn69/R+Pm2Y6c/hU4tBS/L6fwyr+NcSqf2FwwXCV8snvZk9DfQhSS FHDzpSbdSv+P8DD5kKrMtRt2dABKRYz2EJfsKrDhhvOMLNqyk2Da1p7S8o4hxCsBKQ3eOt B+K6Xj+VnpiUgVcrwP1gRE466TJ7A18KrxVXP3oAploVwiCucKcdEeCfT4c8hw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779305938; a=rsa-sha256; cv=none; b=C/yVNL9CzhGWey4kR+Qbf2iIYlSNGUsIU8xnL6Qizg5J1EWeO7xvBOEggrwT7feDIE0/Zw TtBewdUEy0jONom8TsxsoWvkCOpM43XQjQJW7AP5STCBMdHEmggXxcXnYIUcyKxYhbX4Ki F5bK+HpBicfg0l5LTPurENyuk4sue/P2eKt86Snwq2+z4guaFOWoF7kuW7G4V/kXxc0rhN tJrcTcTbf7GqMqGQiFEj7bbA9saDCgbYm0NDOfBoMYVxnVkyicGldp0MFK64vbmOFsFzOd DyXac7lBsch0cPIPPR1Lld/3CRt9nLf3/HrE0tmDNtqvdguH8cVpDIIrzlw1tA== 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=1779305938; 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=kTd+88TxeG770QAFj19ST/fNILdB6tyYudgUcF5zooM=; b=gGno5IRL9PhcEPJ7U80zxm/JmtlWSoxDiL8HWbuT3SDly7a0I6xYxEWwgJC/pKG4+9U8dc VnlvueJzqWNp8Gy+vON9F6xDn5hLcGkzJcHqWenFQVR9qui4QmXsgnCuM7wKpAYe321zop oz9XhrBIfjLY3DHVnF5s5R9BNJI/B1Gi1mKdglpBkQyrEzM6l5VoL2CIgAdVg778nVLLG2 6c5uD9jzttvKGCYKwuruFM+eofsXTGrInvVVn5MQhk6yfk8zDRAWMqhCHoKVyGOWh9gAV7 OBUsQyMBJzUh5jof5T1SZ7np5U4ftPzazwEpjaVoqeCsfwqWSFClRP8VT2d12g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gLMKs6hC5z1F3f for ; Wed, 20 May 2026 19:38:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 389d4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 20 May 2026 19:38:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: ccfb260ac15c - releng/15.1 - bsdconfig: Make sure that SSID names are properly escaped 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: ccfb260ac15c5fba7ee62702a5048a2c83bcb39d Auto-Submitted: auto-generated Date: Wed, 20 May 2026 19:38:57 +0000 Message-Id: <6a0e0dd1.389d4.2d3820eb@gitrepo.freebsd.org> The branch releng/15.1 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ccfb260ac15c5fba7ee62702a5048a2c83bcb39d commit ccfb260ac15c5fba7ee62702a5048a2c83bcb39d Author: Mark Johnston AuthorDate: 2026-05-12 14:16:46 +0000 Commit: Mark Johnston CommitDate: 2026-05-20 13:52:00 +0000 bsdconfig: Make sure that SSID names are properly escaped The f_menu_wpa_scan_results() function returns a list of networks discovered by a scan. The untrusted network names are evaluated in f_dialog_menu_wireless_edit. The quoting applied in f_menu_wpa_scan_results() protects against evaluation of something like "$(whoami)" but one can add single quotes to defeat that. Pass the SSID names through f_shell_escape to work around this. Escape single quotes in f_dialog_wireless_edit() and f_menu_wireless_configs() too for consistency. I note that this module doesn't seem to actually work, see e.g., bugzilla PR 229883. Approved by: re Approved by: so Security: FreeBSD-SA-26:23.bsdinstall Security: CVE-2026-45255 Reported by: Austin Ralls Reviewed by: dteske, des Differential Revision: https://reviews.freebsd.org/D56974 --- usr.sbin/bsdconfig/share/media/wlan.subr | 3 +++ 1 file changed, 3 insertions(+) diff --git a/usr.sbin/bsdconfig/share/media/wlan.subr b/usr.sbin/bsdconfig/share/media/wlan.subr index 5847356d1925..5d271c403b3c 100644 --- a/usr.sbin/bsdconfig/share/media/wlan.subr +++ b/usr.sbin/bsdconfig/share/media/wlan.subr @@ -813,6 +813,7 @@ f_dialog_wireless_edit() [ $nmatches -le ${#DIALOG_MENU_TAGS} ] || break f_substr -v tag "$DIALOG_MENU_TAGS" $nmatches 1 + f_shell_escape "$wssid" wssid f_wireless_describe WIRELESS_$n help menu_list1="$menu_list1 '$tag $wssid' '$wbssid' '$help' @@ -1076,6 +1077,7 @@ f_menu_wireless_configs() while [ $n -lt $nunique ]; do n=$(( $n + 1 )) menuitem_$n get ssid ssid + f_shell_escape "$ssid" ssid menuitem_$n get nconfigs nconfigs desc="$nconfigs $msg_configured_lc" @@ -1184,6 +1186,7 @@ f_menu_wpa_scan_results() while [ $n -lt $nunique ]; do n=$(( $n + 1 )) menuitem_$n get ssid ssid + f_shell_escape "$ssid" ssid desc= if [ "$DIALOG_MENU_WLAN_SHOW_ALL" ]; then