| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20250820010415.699353-19-anthony.yznaga@oracle.com>
Date: Tue, 19 Aug 2025 18:04:11 -0700
From: Anthony Yznaga <anthony.yznaga@...cle.com>
To: linux-mm@...ck.org
Cc: akpm@...ux-foundation.org, andreyknvl@...il.com, arnd@...db.de,
bp@...en8.de, brauner@...nel.org, bsegall@...gle.com, corbet@....net,
dave.hansen@...ux.intel.com, david@...hat.com,
dietmar.eggemann@....com, ebiederm@...ssion.com, hpa@...or.com,
jakub.wartak@...lbox.org, jannh@...gle.com, juri.lelli@...hat.com,
khalid@...nel.org, liam.howlett@...cle.com, linyongting@...edance.com,
lorenzo.stoakes@...cle.com, luto@...nel.org, markhemm@...glemail.com,
maz@...nel.org, mhiramat@...nel.org, mgorman@...e.de, mhocko@...e.com,
mingo@...hat.com, muchun.song@...ux.dev, neilb@...e.de,
osalvador@...e.de, pcc@...gle.com, peterz@...radead.org,
pfalcato@...e.de, rostedt@...dmis.org, rppt@...nel.org,
shakeel.butt@...ux.dev, surenb@...gle.com, tglx@...utronix.de,
vasily.averin@...ux.dev, vbabka@...e.cz, vincent.guittot@...aro.org,
viro@...iv.linux.org.uk, vschneid@...hat.com, willy@...radead.org,
x86@...nel.org, xhao@...ux.alibaba.com, linux-doc@...r.kernel.org,
linux-kernel@...r.kernel.org, linux-arch@...r.kernel.org
Subject: [PATCH v3 18/22] mm/mshare: Add an ioctl for mapping objects in an mshare region
From: Khalid Aziz <khalid@...nel.org>
Reserve a range of ioctls for msharefs and add an ioctl for mapping
objects within an mshare region. The arguments are the same as mmap()
except that the start of the mapping is specified as an offset into
the mshare region instead of as an address. System-selected addresses
are not supported so MAP_FIXED must be specified. Only shared anonymous
memory is supported initially.
Signed-off-by: Khalid Aziz <khalid@...nel.org>
Signed-off-by: Anthony Yznaga <anthony.yznaga@...cle.com>
---
.../userspace-api/ioctl/ioctl-number.rst | 1 +
include/uapi/linux/msharefs.h | 31 ++++++++
mm/mshare.c | 76 ++++++++++++++++++-
3 files changed, 107 insertions(+), 1 deletion(-)
create mode 100644 include/uapi/linux/msharefs.h
diff --git a/Documentation/userspace-api/ioctl/ioctl-number.rst b/Documentation/userspace-api/ioctl/ioctl-number.rst
index 406a9f4d0869..cb7377f40696 100644
--- a/Documentation/userspace-api/ioctl/ioctl-number.rst
+++ b/Documentation/userspace-api/ioctl/ioctl-number.rst
@@ -308,6 +308,7 @@ Code Seq# Include File Comments
'v' 20-27 arch/powerpc/include/uapi/asm/vas-api.h VAS API
'v' C0-FF linux/meye.h conflict!
'w' all CERN SCI driver
+'x' 00-1F linux/msharefs.h msharefs filesystem
'y' 00-1F packet based user level communications
<mailto:zapman@...erlan.net>
'z' 00-3F CAN bus card conflict!
diff --git a/include/uapi/linux/msharefs.h b/include/uapi/linux/msharefs.h
new file mode 100644
index 000000000000..ad129beeef62
--- /dev/null
+++ b/include/uapi/linux/msharefs.h
@@ -0,0 +1,31 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
+/*
+ * msharefs defines a memory region that is shared across processes.
+ * ioctl is used on files created under msharefs to set various
+ * attributes on these shared memory regions
+ *
+ *
+ * Copyright (C) 2024 Oracle Corp. All rights reserved.
+ * Author: Khalid Aziz <khalid@...nel.org>
+ */
+
+#ifndef _UAPI_LINUX_MSHAREFS_H
+#define _UAPI_LINUX_MSHAREFS_H
+
+#include <linux/ioctl.h>
+#include <linux/types.h>
+
+/*
+ * msharefs specific ioctl commands
+ */
+#define MSHAREFS_CREATE_MAPPING _IOW('x', 0, struct mshare_create)
+
+struct mshare_create {
+ __u64 region_offset;
+ __u64 size;
+ __u64 offset;
+ __u32 prot;
+ __u32 flags;
+ __u32 fd;
+};
+#endif
diff --git a/mm/mshare.c b/mm/mshare.c
index 8a23b391fa11..ebec51e655e4 100644
--- a/mm/mshare.c
+++ b/mm/mshare.c
@@ -10,6 +10,7 @@
*
* Copyright (C) 2024 Oracle Corp. All rights reserved.
* Author: Khalid Aziz <khalid@...nel.org>
+ * Author: Matthew Wilcox <willy@...radead.org>
*
*/
@@ -19,6 +20,7 @@
#include <linux/mmu_notifier.h>
#include <linux/mshare.h>
#include <uapi/linux/magic.h>
+#include <uapi/linux/msharefs.h>
#include <linux/falloc.h>
#include <asm/tlbflush.h>
@@ -308,7 +310,7 @@ msharefs_get_unmapped_area(struct file *file, unsigned long addr,
if ((flags & MAP_TYPE) == MAP_PRIVATE)
return -EINVAL;
- if (!mshare_is_initialized(m_data))
+ if (!mshare_is_initialized(m_data) || !mshare_has_owner(m_data))
return -EINVAL;
mshare_start = m_data->start;
@@ -343,6 +345,77 @@ msharefs_get_unmapped_area(struct file *file, unsigned long addr,
pgoff, flags);
}
+static long
+msharefs_create_mapping(struct mshare_data *m_data, struct mshare_create *mcreate)
+{
+ struct mm_struct *host_mm = m_data->mm;
+ unsigned long mshare_start, mshare_end;
+ unsigned long region_offset = mcreate->region_offset;
+ unsigned long size = mcreate->size;
+ unsigned int fd = mcreate->fd;
+ int flags = mcreate->flags;
+ int prot = mcreate->prot;
+ unsigned long populate = 0;
+ unsigned long mapped_addr;
+ unsigned long addr;
+ vm_flags_t vm_flags;
+ int error = -EINVAL;
+
+ mshare_start = m_data->start;
+ mshare_end = mshare_start + m_data->size;
+ addr = mshare_start + region_offset;
+
+ if ((addr < mshare_start) || (addr >= mshare_end) ||
+ (addr + size > mshare_end))
+ goto out;
+
+ /*
+ * Only anonymous shared memory at fixed addresses is allowed for now.
+ */
+ if ((flags & (MAP_SHARED | MAP_FIXED)) != (MAP_SHARED | MAP_FIXED))
+ goto out;
+ if (fd != -1)
+ goto out;
+
+ if (mmap_write_lock_killable(host_mm)) {
+ error = -EINTR;
+ goto out;
+ }
+
+ error = 0;
+ mapped_addr = __do_mmap(NULL, addr, size, prot, flags, vm_flags,
+ 0, &populate, NULL, host_mm);
+
+ if (IS_ERR_VALUE(mapped_addr))
+ error = (long)mapped_addr;
+
+ mmap_write_unlock(host_mm);
+out:
+ return error;
+}
+
+static long
+msharefs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
+{
+ struct mshare_data *m_data = filp->private_data;
+ struct mshare_create mcreate;
+
+ if (!mshare_is_initialized(m_data))
+ return -EINVAL;
+
+ switch (cmd) {
+ case MSHAREFS_CREATE_MAPPING:
+ if (copy_from_user(&mcreate, (struct mshare_create __user *)arg,
+ sizeof(mcreate)))
+ return -EFAULT;
+
+ return msharefs_create_mapping(m_data, &mcreate);
+
+ default:
+ return -ENOTTY;
+ }
+}
+
static int msharefs_set_size(struct mshare_data *m_data, unsigned long size)
{
int error = -EINVAL;
@@ -398,6 +471,7 @@ static const struct file_operations msharefs_file_operations = {
.open = simple_open,
.mmap = msharefs_mmap,
.get_unmapped_area = msharefs_get_unmapped_area,
+ .unlocked_ioctl = msharefs_ioctl,
.fallocate = msharefs_fallocate,
};
--
2.47.1
Powered by blists - more mailing lists