From nobody Thu Jan 15 14:18:58 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 4dsQ8M1vZqz6P2C1 for ; Thu, 15 Jan 2026 14:18:59 +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 4dsQ8L643tz4QTM for ; Thu, 15 Jan 2026 14:18:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768486738; 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=736QsjwsyMG+lNOk8lh1JQD4aOGNqZrOVb0/LYSen5k=; b=f5YAsUWzGr5q/NpgRf3+mNn/eJeLymyYe7nVHkTnfYVyKjVxpcWfpIdYlgXb6c0OWowSFU C45pdo587xVRrV81QlZoqiXNHjcoVHiMu9I1BuCJrrSIzRIX8tV1Cqx8YJUeoN1tF4+YkN /cvXVG6fRpbG4FGKhQTHo0LcE1amGcr6CdI3uSFjwwmIAUkbJXxMWyY92nUbrlU2e6iWb0 /vVNHEb7HkqeyYtRvA9ihSxmVc17jCJLXH1fcV7t0PaPIaMvrtpt/JwqxfQF/fqt+izdNU uG09K+JorOEh5VWafyYLMzfSotZ+50hcTN6K6qw0fno6Wc21fSIF4wQwPHcujA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768486738; 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=736QsjwsyMG+lNOk8lh1JQD4aOGNqZrOVb0/LYSen5k=; b=igXyYen2SFTn9KmrvKof/wT+V9MdFh1Y7WEo+sdm1ZCwqnom55M388XFX9nQJJI/I66PDq OiQulJYFeCowKdyeoO+o8olWLy+ReQyRPn96oQAFO3dvVIBj26KWu14HEDe7sI0Doj4aJ7 +vWxF21BjiLpuY2kjesof7RRTqe4BoMQMx/5EwHSjpbhoEThKE5WgEizVo+8TtFP3gVzyA z/zvoLP4+q9BCmdeDOI/2+E7fUj+RWrf6m5O7WnkZKhMst5lsgdv/hjFeKD91SQLj3amRR MifzyImg+mEvBUTWQjUEuS/kNP0Ev6YJ8dhb1SZ5Arg3FS7fyTR9+nKu+vyG5g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768486738; a=rsa-sha256; cv=none; b=fMJwFgFhzbvG/yQ9KasiVjWTqtvH6O7qtmDQNEETt4V15eG+UY2RcP32qNNhNfqAL77Jke neMWJVLvV1haEYvqq8zOjROFG8Z8o6CkBBwj8oYARzEvfDeWKAkQCINsaJdMaARZgKoHUC 54UvES6KcpM0qc8ofTf6lYlNCilkmHla4n3fGZB4WXeTztney82VAtlpoQF9tN54ie6Nr9 o+NNMsHY43auQI/7GgLHunIngxkfUisJgNPhI3XoESAkYHZfHOMClDRvxfDn30uKA2vkYs kKhx7Nm2ziF0AuZpzoA+0RnrKqczaOs1MBCORgw+aXwf0OTCvgCdrI6aGRllhg== 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 4dsQ8L4hs7zWgB for ; Thu, 15 Jan 2026 14:18:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id eeb6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 15 Jan 2026 14:18:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 251662e5abdd - main - linuxkpi: Clean up linux_shmem_file_setup() a bit 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 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: 251662e5abdd85f5a83766b400e23c2ac5597fb9 Auto-Submitted: auto-generated Date: Thu, 15 Jan 2026 14:18:58 +0000 Message-Id: <6968f752.eeb6.65a21506@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=251662e5abdd85f5a83766b400e23c2ac5597fb9 commit 251662e5abdd85f5a83766b400e23c2ac5597fb9 Author: Mark Johnston AuthorDate: 2026-01-15 13:51:29 +0000 Commit: Mark Johnston CommitDate: 2026-01-15 13:51:29 +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 --- 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)); }