From nobody Thu Nov 05 14:51:52 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 4jL4yc43G6z7075f for ; Thu, 05 Nov 2026 14:51:52 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jL4yc2q2qz3G7x for ; Thu, 05 Nov 2026 14:51:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793890312; 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=QLSFqFFhMdXNVj2skptmYWG0xtJhoW6VD3Z6cNWi2Uk=; b=o+n3Sy39nEf/VG1gG2cTySJ3xsIKdzETRk2NNdAoizqe63LXcDwmmrW18Zz/CD5Bd+sdPX Hsk1bBJugOakg9d/4rKogW1w1+3FPCJkcLAH80ryEc9qd2iLxyn8bouALtb14r78QGcU14 wx0YdVQ+AHIEERmCiqHIiBY5B3RQmVixcfxG/D9dKRoA/f3aFrGvk2btLyRdba+QV26kfI c7id3F2e9GI2WGnRUg+HsLzRUcibH/jjUrrdD/G1SNhD52G1ydFGisFWio+1lpcoUx4Yux NY9irW3hikJQMtm+OaeFoYaXg3ENDavbKU3nY7Jc/dg2L0SJH/CNHCgLeTu3ww== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793890312; b=rZ5OBPWO6QNaiCH+V26zVdihsByw8f3KntfcQiGFxJ8kz+9PP1hSvWfMTxYpS6UTtPlIjA kSUDspru8/UkdMOOvKv+en7HrTqiheCNucCrOqZsw9Q8T1OoS8pIjqqsqTIeDW/BKplyXe Wct/N2DhqrL+ue5IF5D6eDuE6zdh01jLlcoYXu1i/k4GGK2tMtIDYA+8AjFnHuX1a+WCXG PyLPD1qTCvNe6ZfI89s6bbXyTA4CKd3h0fSygQUfKc8vzchkCn8fWYuHbxpbrvs1pnhthp yeWA5uuqnJWQw8fjlYKq0IZNGKFr9pMAY/+T8Qm5bM9hDGytmi5zzrmWEs9W0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793890312; 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=QLSFqFFhMdXNVj2skptmYWG0xtJhoW6VD3Z6cNWi2Uk=; b=dJ2wYiEm/Qz16xuASTnhaPJg7wyLcIy4/3HbBJq/LOWY+62I7cEC479uJjqc/rFgz0WWOg VyuWBbBYmTYs/IOUKvcwGg9Q1wc89MDmGt+QomcezEQJRdKnhzqWVfbW5zP3Mles/FKTb1 Pbwiuu9wyCBOL1G8MgoR6Nagq368Hm6CaF+5JuAj3fASSMXGkjunNllENMhI4D7QUUhfJs ISR4Rji0A9hp0coOF4ujL7ZcpF3na3yqmtS8cw7yUs129ecWUOaVBYYT6zLKzE+GCtAISj 64f2j0JS430ckyoO9x2JW/j2hxKGwWS1Pt3ps0dL1tBUqRciA4w8oZxxb9Pcnw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jL4yc1s7qzvcG for ; Thu, 05 Nov 2026 14:51:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 223a8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Nov 2026 14:51:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 49204732f67c - main - cam: Fix XPT_MMC_IO buffer unmap order in cam_periph_unmapmem() List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository 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: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 49204732f67c32922a7ccc71f3b45f0d1d194cd2 Auto-Submitted: auto-generated Date: Thu, 05 Nov 2026 14:51:52 +0000 Message-Id: <6aec9808.223a8.7658ceff@gitrepo.freebsd.org> The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=49204732f67c32922a7ccc71f3b45f0d1d194cd2 commit 49204732f67c32922a7ccc71f3b45f0d1d194cd2 Author: Emmanuel Vadot AuthorDate: 2026-10-22 06:33:54 +0000 Commit: Emmanuel Vadot CommitDate: 2026-11-05 14:51:26 +0000 cam: Fix XPT_MMC_IO buffer unmap order in cam_periph_unmapmem() XPT_MMC_IO maps two nested buffers: cmd.data, then cmd.data->data whose address is derived from cmd.data. cam_periph_unmapmem() restored them in forward order, so it put cmd.data back to its userspace value and then dereferenced that pointer to reach cmd.data->data from kernel context, panicking in vm_fault_lookup(). Unmap in reverse order, mirroring how the mappings were created. This is a no-op for single-buffer func_codes and for the other two-buffer cases (XPT_DEV_MATCH, XPT_SMP_IO), whose buffers are independent. The bug is only reachable via the pass(4) userspace path, which maps and unmaps CCB buffers; in-kernel MMCCAM consumers never call cam_periph_{map,unmap}mem(). Triggered by a userspace SDIO CMD53 transfer from sdiotool(8) through pass(4). MFC after: 1 week Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D61021 --- sys/cam/cam_periph.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/sys/cam/cam_periph.c b/sys/cam/cam_periph.c index d79977249cf2..3de3ae327dc9 100644 --- a/sys/cam/cam_periph.c +++ b/sys/cam/cam_periph.c @@ -1111,7 +1111,13 @@ cam_periph_unmapmem(union ccb *ccb, struct cam_periph_map_info *mapinfo) } error = 0; - for (i = 0; i < numbufs; i++) { + /* + * Unmap in reverse order. XPT_MMC_IO maps cmd.data and then + * cmd.data->data; the second pointer lives inside the first + * mapping, so it must be processed before the first mapping is + * removed. + */ + for (i = numbufs - 1; i >= 0; i--) { if (mapinfo->bp[i]) { /* unmap the buffer */ vunmapbuf(mapinfo->bp[i]);