From nobody Wed May 20 19:35:51 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 4gLMGH5tWlz6fJF2 for ; Wed, 20 May 2026 19:35:51 +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 4gLMGH2GHbz3QXX for ; Wed, 20 May 2026 19:35:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779305751; 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=zP+ypm8RZHhP+19wfEKtgzCBuOM4hxf9mBiAX9z9624=; b=CrYmMMlfAKLzAkwzDg6FqlB01CIFPrtIkvgXSBXZa1w8SGSVF3UTeFdjFhz9x7eefREO8F EjGZMDrAGpbG2gMkSCz8SOOqKaWsgj4SfCmpoZAHLAyI3zTDVeG5P1A7RnHtCcCKnKFobb qAsrAVLSCPH3cUj46CwiO7VEaXVvzD+UtItsIjIOVdYkB1JnwlVoKUF1wIUDEBJ6+nK8WS +btEOs5HJqLVCGmVChirqzuOB3k6eGM/NuusqVQsbqJ7gG66aA3OOoPWr8nYs3DRoFVJhi FMrU5dzxavwLMkcxKigAZ+TllaMMp1Mhp2PK4Dj8gGUyGPv9ypB3FCckooUofQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779305751; a=rsa-sha256; cv=none; b=rsunW3JhSL70H1d7x5GXIWWbCyPMxk290sNVJJcvrbXQpu5GumUmYHb/R6nMdmTggJPP5M PSTrJ1qB3TOhm/YJuL+oxemeNlZoVuZ3sMaa7RX2Vis4JNMLG1IHCJfq6+TzosaI4/yOue V9LXEKQtC1zIcvsk12vTzizDhdOPCXhxlif8i0qqtmAQrqFCRfEallgUwsp8jIvcJTckS9 aI5Xtqh1uSEEStcE+4nYgxB7TdmxoMgn4LEJZPVeu+GfRt0AnxaDyoyqYW2Z5RniXm9/Rm NBbQTnwUZ1aXkX+ERe8ymj5ji7UvP2FV0rYZ7osEtL1KiT4AeBNkMUrg2kBsTA== 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=1779305751; 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=zP+ypm8RZHhP+19wfEKtgzCBuOM4hxf9mBiAX9z9624=; b=iTOhgNf0qGLIgBwFYOawSXGA/Q42SXdo+v7rTyreJBsLWmSPTRsHNbxVt0LUqr653ikXzf hRlphZyAMF3eUqIdubV7q41I32Hxr0O5undAxxCDi1Amu2SaYwJiqZsdix4dOfh+XpfxUE 7mUUgNqinl1pky5xBKUf6A0aZ6IRQRM0c+7S1hLJQNFrx73/MXHyoUCs9ytNZNJJzc4T7W 64q/f+jJGTKMNWUWzNOo+QtlDZasklxAzDM0Fpobj3Fc1dchWYnBMVatu546XaCOL5E0tb TeLY7QL7dJl4KEizTtFTWqw/GQPxF0Cuif/XL8U3NVHarQB9zEBl82gWDhwlVA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gLMGH1ny7z1Dbp for ; Wed, 20 May 2026 19:35:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38413 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 20 May 2026 19:35:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 2afb4c979f2d - main - 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/main X-Git-Reftype: branch X-Git-Commit: 2afb4c979f2d1befc3e259a0a7359a8e31a48e55 Auto-Submitted: auto-generated Date: Wed, 20 May 2026 19:35:51 +0000 Message-Id: <6a0e0d17.38413.67d1580c@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=2afb4c979f2d1befc3e259a0a7359a8e31a48e55 commit 2afb4c979f2d1befc3e259a0a7359a8e31a48e55 Author: Mark Johnston AuthorDate: 2026-05-12 14:16:46 +0000 Commit: Mark Johnston CommitDate: 2026-05-20 19:34:51 +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