From nobody Thu Nov 05 14:51:53 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 4jL4yd6zXXz7075l for ; Thu, 05 Nov 2026 14:51:53 +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 4jL4yd3QJQz3GKH for ; Thu, 05 Nov 2026 14:51:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793890313; 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=OGfgG0cBj3XtBRps555Nq044iACirI2CbxO5VWlf3IQ=; b=d5xKv2TiLC7wHaMrKxvaUZoAQdNDI6rTGdHWPYOZ6PBVQGz1lrZasCARCinIBjn40733ky zC89ixnjFwjg6fHSaPqH28EN2t9KueDShxUB0cp0pg7p85qIxDjEDabFSmU9AGbMhkvi7y 3jVUu9wu8FbZOfsvdZgKOKLT+Q2oP0+JCl4GznJfP0orWeHuZgeFZYxMjjMzUNWu+gTx7Q FuOq8mwsYV9tlgXQ7R8R+7vGG9KJQGcee1RmspPEc0w0NbzvKYaghDg/YD0x0NT8yRBiIk XSYKUrSDZDzdjfpHaSYg5FAaoGNq6fTY4Xd06bJcZ+h7HWXvVd2XtdynGT6uEg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793890313; b=jhKg68Hw+BE1p5Q2kl4t3+Jwl5v5pSZDmG8l3EduYcgLC4li6f3+klCxSLWneBfJijrRQn f107p84QHx2FEUVFzsF3c/kW4ZBFKZGeZR/urgHTsMWyPs2T7HDirul9a3GiBLcF4J2aJ7 +mshH3Kc7wMXJXe50zsmeYSsImhC6rDMa6AV3Pnnt4/98PPsIhSzOA95vag+ydpsdDLQMN iqrIQZPEkzcHO6btSn8q01SkmUlA4tdRa6A7aRgGhTIucJyfSVIh3yvF8XUpi/2qdon1Ba kPJSn0cZ0aApuT9UHie2QE8RhNekATcVZztmFriA7hX3rBCilCzckmHbXYGuyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793890313; 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=OGfgG0cBj3XtBRps555Nq044iACirI2CbxO5VWlf3IQ=; b=t99SDhtvAdNeTwtZebj5T856jGU5zJvPgg80b9BtHI197/kevA5ZedH2tZt0hI8qbZjtag DpsMFEEiL0xecBc8/x7SIZ3FPeR5Uq0+OB3wklBLXRVBtQWYy7ZR+YxhSSV9doxHvgMwIS PUzipe8Yxna2c+fcAQHP1aGAdffnHTlAMnxiQd4banJuDdVOWlorgw9qSn6nfZvgtKBZwW nSGNJf1qTt7dM594t5F4sQFPx+SV25eoBfkFR+rjkI00MOgvlPnUszdNbUvpgYpIymTK2U G1PLu3zMrkNvNkauRDQfblRBOROuTf4MnxqvefVZ1olqkLo/r88fOA3ktl9Y4Q== 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 4jL4yd2gVqzvP6 for ; Thu, 05 Nov 2026 14:51:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2231b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Nov 2026 14:51:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: bf99b74302bd - main - cam: Fix the mmc_data mapping length for XPT_MMC_IO 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: bf99b74302bdeb533a7f89149b0fcd2d9e225dad Auto-Submitted: auto-generated Date: Thu, 05 Nov 2026 14:51:53 +0000 Message-Id: <6aec9809.2231b.41c7e8d1@gitrepo.freebsd.org> The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=bf99b74302bdeb533a7f89149b0fcd2d9e225dad commit bf99b74302bdeb533a7f89149b0fcd2d9e225dad Author: Emmanuel Vadot AuthorDate: 2026-10-22 06:33:54 +0000 Commit: Emmanuel Vadot CommitDate: 2026-11-05 14:51:31 +0000 cam: Fix the mmc_data mapping length for XPT_MMC_IO cam_periph_mapmem() and cam_periph_unmapmem() map the user-provided struct mmc_data for XPT_MMC_IO CCBs, but use sizeof(struct mmc_data *) instead of sizeof(struct mmc_data) as the length. Only the pages covering a pointer are mapped, so accessing a field past the first pointer-sized region (for instance cmd->data->flags) faults if the structure happens to straddle a page boundary and the following page is not mapped. The failure is intermittent because it depends on where the caller places the struct mmc_data. Issuing a CMD53 CCB through pass(4) to an MMCCAM SDIO card whose struct mmc_data lands at the end of a page panics with "data abort in critical section or under mutex" in the host driver. Map the whole structure in both the map and unmap paths. MFC after: 1 week Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D61022 --- sys/cam/cam_periph.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/cam/cam_periph.c b/sys/cam/cam_periph.c index 3de3ae327dc9..8f22e08c878a 100644 --- a/sys/cam/cam_periph.c +++ b/sys/cam/cam_periph.c @@ -897,7 +897,7 @@ cam_periph_mapmem(union ccb *ccb, struct cam_periph_map_info *mapinfo, return(0); /* Two mappings: one for cmd->data and one for cmd->data->data */ data_ptrs[0] = (unsigned char **)&ccb->mmcio.cmd.data; - lengths[0] = sizeof(struct mmc_data *); + lengths[0] = sizeof(struct mmc_data); dirs[0] = ccb->ccb_h.flags & CAM_DIR_MASK; data_ptrs[1] = (unsigned char **)&ccb->mmcio.cmd.data->data; lengths[1] = ccb->mmcio.cmd.data->len; @@ -1076,7 +1076,7 @@ cam_periph_unmapmem(union ccb *ccb, struct cam_periph_map_info *mapinfo) break; case XPT_MMC_IO: data_ptrs[0] = (uint8_t **)&ccb->mmcio.cmd.data; - lengths[0] = sizeof(struct mmc_data *); + lengths[0] = sizeof(struct mmc_data); dirs[0] = ccb->ccb_h.flags & CAM_DIR_MASK; data_ptrs[1] = (uint8_t **)&ccb->mmcio.cmd.data->data; lengths[1] = ccb->mmcio.cmd.data->len;