From nobody Wed May 20 19:36:43 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 4gLMHH66Vxz6fJPx for ; Wed, 20 May 2026 19:36:43 +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 4gLMHH3kXMz3Rys for ; Wed, 20 May 2026 19:36:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779305803; 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=5MtY002WEx1Zg8HKrV2smJCbHrpPf0hHPyLToDXxuJQ=; b=DaTVDW0QK3kVa3VtwVGyjgofQ3/OVPBRBrSKzz1u2DYpspc1y1KfxtkzmBVQoxenbygMNf dWP8gTDVn/J00wSsv3NZhtZPwsCsj6DgW4Fl7wAy9wlPhOHo97u4ssmBOC2I2kC5NLIcW/ k0uRlxa74sJ1MFgwXqJwgvYRr1fIprYliys5LIutAq6Ixspw2ZeYce5htT+OuC0YrcdsnU dl84o7U6VYxCjzr6JT4jNk9Fngg25kPqugjGvGNpIcbRkeQ6yRL2aV5LR1t9lFf4aUma0g ySrPSLXm4dc5xsnteHjUQ/Op4JZqVw4qZIqPr2Lfv3+o0+otHwsJO1+KwIaz7w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779305803; a=rsa-sha256; cv=none; b=lCvvSVIl/dz2M4djPqvvjz7WzsKnexI75CPUowBpEQ3qcS4MfgzC5ShzbfT75jH+Ji+/e/ OEr3IBuQ561XKfbpNOr5aXlp4gHW+pMZjQjg88OUQEnZbvnaz3irspxarJNwS8gfLANBTu 8Qy1dmhZu7U0TXIarC0Z5QPMgybL4g6c4Mw1iFSPCw8wWR4XvEyq3+TcthhwujBI5As4jH 1b8DmGJWiF7QiFrvHTfSSWNChV7A+AC06Rx5R4zICT8wLQ90Jqw/C8fpT9/eEdW2dPzy5X rAQ3NZwlfUednAWZaBCJ3lPUwKa5/LOEN3/z2Rr/PEIQA4tojwbRw3p9uP9Pyg== 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=1779305803; 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=5MtY002WEx1Zg8HKrV2smJCbHrpPf0hHPyLToDXxuJQ=; b=ubjsOXR6UWombN3457JS5RF9shiHP0Pya1Jkd9INPkx9IzfhKAWEByRabVYETdS1TIdKCk xNh8z0Lj38Ne8d3ZcyEh8UNnVCijCkpIv4U8acheq+BYf1JTwsYbGpcPw7rfzEMBW3RCL9 oWwnliJc5KO0X0JKy9Mm7kbZgJU26TEvqFvP55I1F8YdVwlHtzaQSSBR8cTK1KS/UX7Wpr in8FOmeRQF19/RrdkzvUT4PauaFOISJie7FiQSpAyi87Dn0WSnPTK6oT54yj/vWYwbXbgO vwSnz/wThm8/lbp7VEpFFw9DIl0NontIVp3M7g45XYuV5yta5F/NIf10AFrUVA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gLMHH3H6nz1Dsc for ; Wed, 20 May 2026 19:36:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 367e1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 20 May 2026 19:36:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 6f5674b97fd6 - stable/15 - 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 6f5674b97fd6d5c0c6933a8d8579b0f93c307362 Auto-Submitted: auto-generated Date: Wed, 20 May 2026 19:36:43 +0000 Message-Id: <6a0e0d4b.367e1.369dbf44@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=6f5674b97fd6d5c0c6933a8d8579b0f93c307362 commit 6f5674b97fd6d5c0c6933a8d8579b0f93c307362 Author: Mark Johnston AuthorDate: 2026-05-12 14:16:46 +0000 Commit: Mark Johnston CommitDate: 2026-05-20 19:36:01 +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: 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