From nobody Mon Jan 26 00:52:39 2026 X-Original-To: dev-commits-src-branches@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 4dzqkv6f66z6PMhY for ; Mon, 26 Jan 2026 00:52:39 +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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dzqkv3Kt6z3SH7 for ; Mon, 26 Jan 2026 00:52:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769388759; 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=14UJhtFsj2REHBsyCMQFeUozVbkY7JKbCOBwLR79H3U=; b=U6KS03clVovoQVzF9lkv+IFrZvDyASnvedCIMTzoo5oeKgXB/oRelef+vIp5Uj1SYemwGE vpDyzctrcKrJovENXSGlGiSGs7rsAJ/wRUGBVs7CEOVOe+r8wv7SsEBi6dkeeasWkTi6g1 hA7G0eHz3GcmYUBMyAx5PEuYyF0oryplNb1rYtaVkkxBVy/JML/fvm9t5KKrVcHViYBbeM sncmQPjKo+cXlEgOI8fqGxtcrMHAAe+OhXBqrSLnUkJj1ZaVL0OnMuUB0+C0ZRPIgtWcJ9 ceSj+gB4emTYYpmeesEJYC1gmcr+h41S9e39sBPqshrFeGb9TSf4zwK5VmrrIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769388759; 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=14UJhtFsj2REHBsyCMQFeUozVbkY7JKbCOBwLR79H3U=; b=aZcIu4dSdue7yH90T2HNKeVe4v2XFVnURrFYVTDFpJvTbjAz+HZn01ND8pKDE/f7yVRJdL Y3u1Gz5fLG7lSDHJ7JSPgdEQAuo3yhZagI0+BD3PKA/hwiujYMQ6KINZsfCkeJn2d/rgf4 eKTYlq44f4T7rVr9rYOtuU8t3OaL36Q3RUg8hpABPO88OjzpgNDyK+vm8AedNlyQ0sxOcI lBOhN0SwO0MgAf50+0dHFVhi54wByY+6lrWeR95eVo0UU45bhqCAul4M4QuVsm2EAKdC9T nd5Ymyg/TNWGOdF2dEisFAAmaC5YaQ1NOMsTwAJu7vtJSV+bxcsvVysuK7He4A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769388759; a=rsa-sha256; cv=none; b=rVpBwJRjFx5WR8w3FUIqeK+axTL6vyimHSqY9ZrGkA2kS9/LgMfpz9eIPnL0b7HVVABU5m dwiCINv9Ibh077aGAP09Txv15pGLtgEGUsrZp0x/NXDZdqEH6h/u3NfushLwF3NBJIzS1k OzO4Ok4SKccLlr+0RKmeE5vWHI9aG6fvzTGfmCozpj9qSGRoW2PJT50/nuSMEuf3H0KTvJ gVV3ExDI+YsqJum9gtd42gPNSXZ6LbzlEQF2FlkrEpnHf5lxqgwAOjP2lIfB//VzqZYu/J iSMLFRRXBVBy2q6X0U7h6B5E23SaffkwK2yFuaEeYNItUDbUHilBV8F48gUekA== 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 4dzqkv2qHKzyCf for ; Mon, 26 Jan 2026 00:52:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 46e74 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 26 Jan 2026 00:52:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: f1e1bfe228e9 - stable/15 - linuxkpi: Clean up linux_shmem_file_setup() a bit List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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: f1e1bfe228e996fc5254595e8425d021a412e489 Auto-Submitted: auto-generated Date: Mon, 26 Jan 2026 00:52:39 +0000 Message-Id: <6976bad7.46e74.374e64be@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=f1e1bfe228e996fc5254595e8425d021a412e489 commit f1e1bfe228e996fc5254595e8425d021a412e489 Author: Mark Johnston AuthorDate: 2026-01-15 13:51:29 +0000 Commit: Mark Johnston CommitDate: 2026-01-26 00:51:44 +0000 linuxkpi: Clean up linux_shmem_file_setup() a bit - Free the pointer that was returned by the allocator, instead of the address of the first member. These will be equal in practice, but it's sketchy and won't work on CHERI with subobject bounds checking. - Use an anonymous struct, there's no need to name it. Reviewed by: bz, brooks, emaste MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D54673 (cherry picked from commit 251662e5abdd85f5a83766b400e23c2ac5597fb9) --- sys/compat/linuxkpi/common/src/linux_shmemfs.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_shmemfs.c b/sys/compat/linuxkpi/common/src/linux_shmemfs.c index 1fb17bc5c0cb..d5c118ba7624 100644 --- a/sys/compat/linuxkpi/common/src/linux_shmemfs.c +++ b/sys/compat/linuxkpi/common/src/linux_shmemfs.c @@ -62,11 +62,10 @@ linux_shmem_read_mapping_page_gfp(vm_object_t obj, int pindex, gfp_t gfp) struct linux_file * linux_shmem_file_setup(const char *name, loff_t size, unsigned long flags) { - struct fileobj { + struct { struct linux_file file __aligned(sizeof(void *)); struct vnode vnode __aligned(sizeof(void *)); - }; - struct fileobj *fileobj; + } *fileobj; struct linux_file *filp; struct vnode *vp; int error; @@ -89,7 +88,7 @@ linux_shmem_file_setup(const char *name, loff_t size, unsigned long flags) } return (filp); err_1: - kfree(filp); + kfree(fileobj); err_0: return (ERR_PTR(error)); }