X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flibsystemd-bus%2Fkdbus.h;h=d419772f52f96d7fb9d0a9917db6dd3e0624e887;hp=16d2d1adbf0f5fd7b609e0d3c8a0ea1a9688fd48;hb=8bd54e897c2a62866e6b15244e784a07ff2b2af4;hpb=1b9abbf0d834bbd61bde1d97eaf7d59776144077

diff --git a/src/libsystemd-bus/kdbus.h b/src/libsystemd-bus/kdbus.h
index 16d2d1adb..d419772f5 100644
--- a/src/libsystemd-bus/kdbus.h
+++ b/src/libsystemd-bus/kdbus.h
@@ -2,6 +2,8 @@
  * Copyright (C) 2013 Kay Sievers
  * Copyright (C) 2013 Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  * Copyright (C) 2013 Linux Foundation
+ * Copyright (C) 2013 Lennart Poettering
+ * Copyright (C) 2013 Daniel Mack <daniel@zonque.org>
  *
  * kdbus is free software; you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License as published by the
@@ -19,19 +21,31 @@
 #endif
 
 #define KDBUS_IOC_MAGIC			0x95
+#define KDBUS_SRC_ID_KERNEL		(0)
+#define KDBUS_DST_ID_WELL_KNOWN_NAME	(0)
+#define KDBUS_MATCH_SRC_ID_ANY		(~0ULL)
+#define KDBUS_DST_ID_BROADCAST		(~0ULL)
+
+/* Common first elements in a structure which are used to iterate over
+ * a list of elements. */
+#define KDBUS_PART_HEADER \
+	struct {							\
+		__u64 size;						\
+		__u64 type;						\
+	}
 
 /* Message sent from kernel to userspace, when the owner or starter of
  * a well-known name changes */
-struct kdbus_manager_msg_name_change {
+struct kdbus_notify_name_change {
 	__u64 old_id;
 	__u64 new_id;
-	__u64 flags;		/* 0 or (possibly?) KDBUS_CMD_NAME_IN_QUEUE */
+	__u64 flags;			/* 0 or (possibly?) KDBUS_NAME_IN_QUEUE */
 	char name[0];
 };
 
-struct kdbus_manager_msg_id_change {
+struct kdbus_notify_id_change {
 	__u64 id;
-	__u64 flags; /* The kernel flags field from KDBUS_CMD_HELLO */
+	__u64 flags;			/* The kernel flags field from KDBUS_HELLO */
 };
 
 struct kdbus_creds {
@@ -48,85 +62,109 @@ struct kdbus_creds {
 	__u64 starttime;
 };
 
-#define KDBUS_SRC_ID_KERNEL		(0)
-#define KDBUS_DST_ID_WELL_KNOWN_NAME	(0)
-#define KDBUS_MATCH_SRC_ID_ANY		(~0ULL)
-#define KDBUS_DST_ID_BROADCAST		(~0ULL)
+struct kdbus_audit {
+	__u64 sessionid;
+	__u64 loginuid;
+};
+
+struct kdbus_timestamp {
+	__u64 monotonic_ns;
+	__u64 realtime_ns;
+};
 
-/* Message Data Types */
+struct kdbus_vec {
+	__u64 size;
+	union {
+		__u64 address;
+		__u64 offset;
+	};
+};
+
+struct kdbus_memfd {
+	__u64 size;
+	int fd;
+	__u32 __pad;
+};
+
+/* Message Item Types */
 enum {
+	_KDBUS_ITEM_NULL,
+
 	/* Filled in by userspace */
-	KDBUS_MSG_NULL,			/* empty record */
-	KDBUS_MSG_PAYLOAD,		/* .data */
-	KDBUS_MSG_PAYLOAD_VEC,		/* .data_vec, converted into _PAYLOAD at delivery */
-	KDBUS_MSG_MMAP,			/* .data_vec */
-	KDBUS_MSG_MMAP_DONATE,		/* .data_vec, unmap the memory from the sender */
-	KDBUS_MSG_UNIX_FDS,		/* .data_fds of file descriptors */
-	KDBUS_MSG_BLOOM,		/* for broadcasts, carries bloom filter blob */
-	KDBUS_MSG_DST_NAME,		/* destination's well-known name */
+	KDBUS_ITEM_PAYLOAD_VEC,		/* .data_vec, reference to memory area */
+	KDBUS_ITEM_PAYLOAD_OFF,		/* .data_vec, reference to memory area */
+	KDBUS_ITEM_PAYLOAD_MEMFD,	/* file descriptor of a special data file */
+	KDBUS_ITEM_FDS,			/* .data_fds of file descriptors */
+	KDBUS_ITEM_BLOOM,		/* for broadcasts, carries bloom filter blob in .data */
+	KDBUS_ITEM_DST_NAME,		/* destination's well-known name, in .str */
+	KDBUS_ITEM_PRIORITY,		/* queue priority for message */
 
 	/* Filled in by kernelspace */
-	KDBUS_MSG_SRC_NAMES	= 0x200,/* NUL separated string list with well-known names of source */
-	KDBUS_MSG_TIMESTAMP,		/* .ts_ns of CLOCK_MONOTONIC */
-	KDBUS_MSG_SRC_CREDS,		/* .creds */
-	KDBUS_MSG_SRC_COMM,		/* optional */
-	KDBUS_MSG_SRC_EXE,		/* optional */
-	KDBUS_MSG_SRC_CMDLINE,		/* optional */
-	KDBUS_MSG_SRC_CGROUP,		/* optional, specified which one */
-	KDBUS_MSG_SRC_CAPS,		/* caps data blob */
-	KDBUS_MSG_SRC_SECLABEL,		/* NUL terminated string */
-	KDBUS_MSG_SRC_AUDIT,		/* array of two uint64_t of audit loginuid + sessiond */
+	KDBUS_ITEM_NAMES	= 0x400,/* NUL separated string list with well-known names of source */
+	KDBUS_ITEM_TIMESTAMP,		/* .timestamp */
+
+	/* when appended to a message, the following items refer to the sender */
+	KDBUS_ITEM_CREDS,		/* .creds */
+	KDBUS_ITEM_PID_COMM,		/* optional, in .str */
+	KDBUS_ITEM_TID_COMM,		/* optional, in .str */
+	KDBUS_ITEM_EXE,		/* optional, in .str */
+	KDBUS_ITEM_CMDLINE,		/* optional, in .str (a chain of NUL str) */
+	KDBUS_ITEM_CGROUP,		/* optional, in .str */
+	KDBUS_ITEM_CAPS,		/* caps data blob, in .data */
+	KDBUS_ITEM_SECLABEL,		/* NUL terminated string, in .str */
+	KDBUS_ITEM_AUDIT,		/* .audit */
 
 	/* Special messages from kernel, consisting of one and only one of these data blocks */
-	KDBUS_MSG_NAME_ADD	= 0x400,/* .name_change */
-	KDBUS_MSG_NAME_REMOVE,		/* .name_change */
-	KDBUS_MSG_NAME_CHANGE,		/* .name_change */
-	KDBUS_MSG_ID_ADD,		/* .id_change */
-	KDBUS_MSG_ID_REMOVE,		/* .id_change */
-	KDBUS_MSG_ID_CHANGE,		/* .id_change */
-	KDBUS_MSG_REPLY_TIMEOUT,	/* empty, but .reply_cookie in .kdbus_msg is filled in */
-	KDBUS_MSG_REPLY_DEAD,		/* dito */
-};
-
-struct kdbus_vec {
-	__u64 address;
-	__u64 size;
+	KDBUS_ITEM_NAME_ADD	= 0x800,/* .name_change */
+	KDBUS_ITEM_NAME_REMOVE,		/* .name_change */
+	KDBUS_ITEM_NAME_CHANGE,		/* .name_change */
+	KDBUS_ITEM_ID_ADD,		/* .id_change */
+	KDBUS_ITEM_ID_REMOVE,		/* .id_change */
+	KDBUS_ITEM_REPLY_TIMEOUT,	/* empty, but .reply_cookie in .kdbus_msg is filled in */
+	KDBUS_ITEM_REPLY_DEAD,		/* dito */
 };
 
 /**
- * struct  kdbus_msg_data - chain of data blocks
+ * struct  kdbus_item - chain of data blocks
  *
  * size: overall data record size
- * type: kdbus_msg_data_type of data
+ * type: kdbus_item type of data
  */
-struct kdbus_msg_data {
-	__u64 size;
-	__u64 type;
+struct kdbus_item {
+	KDBUS_PART_HEADER;
 	union {
 		/* inline data */
 		__u8 data[0];
-		__u32 data_u32[0];
-		__u64 data_u64[0];
+		__u32 data32[0];
+		__u64 data64[0];
+		char str[0];
+
+		/* connection */
+		__u64 id;
 
 		/* data vector */
 		struct kdbus_vec vec;
 
-		/* specific fields */
-		int fds[0];				/* int array of file descriptors */
-		__u64 ts_ns;				/* timestamp in nanoseconds */
+		/* process credentials and properties*/
 		struct kdbus_creds creds;
-		struct kdbus_manager_msg_name_change name_change;
-		struct kdbus_manager_msg_id_change id_change;
+		struct kdbus_audit audit;
+		struct kdbus_timestamp timestamp;
+
+		/* specific fields */
+		struct kdbus_memfd memfd;
+		int fds[0];
+		struct kdbus_notify_name_change name_change;
+		struct kdbus_notify_id_change id_change;
 	};
 };
 
 enum {
-	KDBUS_MSG_FLAGS_EXPECT_REPLY	= 1,
-	KDBUS_MSG_FLAGS_NO_AUTO_START	= 2, /* possibly? */
+	KDBUS_MSG_FLAGS_EXPECT_REPLY	= 1 << 0,
+	KDBUS_MSG_FLAGS_NO_AUTO_START	= 1 << 1,
 };
 
 enum {
-	KDBUS_PAYLOAD_NONE	= 0,
+	KDBUS_PAYLOAD_KERNEL,
 	KDBUS_PAYLOAD_DBUS1	= 0x4442757356657231ULL, /* 'DBusVer1' */
 	KDBUS_PAYLOAD_GVARIANT	= 0x4756617269616e74ULL, /* 'GVariant' */
 };
@@ -137,8 +175,7 @@ enum {
  * set by userspace:
  * dst_id: destination id
  * flags: KDBUS_MSG_FLAGS_*
- * data_size: overall message size
- * data: data records
+ * items: data records
  *
  * set by kernel:
  * src_id: who sent the message
@@ -146,83 +183,90 @@ enum {
 struct kdbus_msg {
 	__u64 size;
 	__u64 flags;
-	__u64 dst_id;		/* connection, 0 == name in data, ~0 broadcast */
-	__u64 src_id;		/* connection, 0 == kernel */
-	__u64 payload_type;	/* 'DBusVer1', 'GVariant', ... */
-	__u64 cookie;		/* userspace-supplied cookie */
+	__u64 dst_id;			/* connection, 0 == name in data, ~0 broadcast */
+	__u64 src_id;			/* connection, 0 == kernel */
+	__u64 payload_type;		/* 'DBusVer1', 'GVariant', ... */
+	__u64 cookie;			/* userspace-supplied cookie */
 	union {
 		__u64 cookie_reply;	/* cookie we reply to */
 		__u64 timeout_ns;	/* timespan to wait for reply */
 	};
-	struct kdbus_msg_data data[0];
+	struct kdbus_item items[0];
 };
 
 enum {
+	_KDBUS_POLICY_NULL,
 	KDBUS_POLICY_NAME,
 	KDBUS_POLICY_ACCESS,
 };
 
 enum {
-	KDBUS_POLICY_USER,
-	KDBUS_POLICY_GROUP,
-	KDBUS_POLICY_WORLD,
+	_KDBUS_POLICY_ACCESS_NULL,
+	KDBUS_POLICY_ACCESS_USER,
+	KDBUS_POLICY_ACCESS_GROUP,
+	KDBUS_POLICY_ACCESS_WORLD,
 };
 
 enum {
-	KDBUS_POLICY_RECV	= 4,
-	KDBUS_POLICY_SEND	= 2,
-	KDBUS_POLICY_OWN	= 1,
+	KDBUS_POLICY_RECV		= 1 <<  2,
+	KDBUS_POLICY_SEND		= 1 <<  1,
+	KDBUS_POLICY_OWN		= 1 <<  0,
+};
+
+struct kdbus_policy_access {
+	__u64 type;		/* USER, GROUP, WORLD */
+	__u64 bits;		/* RECV, SEND, OWN */
+	__u64 id;		/* uid, gid, 0 */
 };
 
+//FIXME: convert access to access[]
 struct kdbus_policy {
-	__u64 size;
-	__u64 type; /* NAME or ACCESS */
+	KDBUS_PART_HEADER;
 	union {
 		char name[0];
-		struct {
-			__u32 type;	/* USER, GROUP, WORLD */
-			__u32 bits;	/* RECV, SEND, OWN */
-			__u64 id;	/* uid, gid, 0 */
-		} access;
+		struct kdbus_policy_access access;
 	};
 };
 
+/* A series of KDBUS_POLICY_NAME, plus one or more KDBUS_POLICY_ACCESS */
 struct kdbus_cmd_policy {
 	__u64 size;
-	__u8 buffer[0];	/* a series of KDBUS_POLICY_NAME plus one or more KDBUS_POLICY_ACCESS each. */
+	struct kdbus_policy policies[0];
 };
 
+/* Flags for struct kdbus_cmd_hello */
 enum {
-	KDBUS_CMD_HELLO_STARTER		=  1,
-	KDBUS_CMD_HELLO_ACCEPT_FD	=  2,
-	KDBUS_CMD_HELLO_ACCEPT_MMAP	=  4,
+	KDBUS_HELLO_STARTER		=  1 <<  0,
+	KDBUS_HELLO_ACCEPT_FD		=  1 <<  1,
 };
 
+/* Flags for message attachments */
 enum {
-	KDBUS_CMD_FNAME_ACCESS_GROUP	=  1,
-	KDBUS_CMD_FNAME_ACCESS_WORLD	=  2,
-	KDBUS_CMD_FNAME_POLICY_NONE	=  4,
+	KDBUS_ATTACH_TIMESTAMP		=  1 <<  0,
+	KDBUS_ATTACH_CREDS		=  1 <<  1,
+	KDBUS_ATTACH_NAMES		=  1 <<  2,
+	KDBUS_ATTACH_COMM		=  1 <<  3,
+	KDBUS_ATTACH_EXE		=  1 <<  4,
+	KDBUS_ATTACH_CMDLINE		=  1 <<  5,
+	KDBUS_ATTACH_CGROUP		=  1 <<  6,
+	KDBUS_ATTACH_CAPS		=  1 <<  7,
+	KDBUS_ATTACH_SECLABEL		=  1 <<  8,
+	KDBUS_ATTACH_AUDIT		=  1 <<  9,
 };
 
 struct kdbus_cmd_hello {
+	__u64 size;
+
 	/* userspace → kernel, kernel → userspace */
-	__u64 kernel_flags;	/* userspace specifies its
+	__u64 conn_flags;	/* userspace specifies its
 				 * capabilities and more, kernel
 				 * returns its capabilites and
 				 * more. Kernel might refuse client's
 				 * capabilities by returning an error
-				 * from KDBUS_CMD_HELLO */
-
-	/* userspace → kernel */
-	__u64 pid;		/* To allow translator services which
-				 * connect to the bus on behalf of
-				 * somebody else, allow specifiying
-				 * the PID of the client to connect on
-				 * behalf on. Normal clients should
-				 * pass this as 0 (i.e. to do things
-				 * under their own PID). Priviliged
-				 * clients can pass != 0, to operate
-				 * on behalf of somebody else. */
+				 * from KDBUS_HELLO */
+	__u64 attach_flags;	/* userspace specifies the metadata
+				 * attachments it wishes to receive with
+				 * every message. */
 
 	/* kernel → userspace */
 	__u64 bus_flags;	/* this is .flags copied verbatim from
@@ -230,81 +274,123 @@ struct kdbus_cmd_hello {
 				 * ioctl. It's intended to be useful
 				 * to do negotiation of features of
 				 * the payload that is transfreted. */
-	__u64 id;		/* peer id */
+	__u64 id;		/* id assigned to this connection */
+	__u64 bloom_size;	/* The bloom filter size chosen by the
+				 * bus owner */
+	__u64 pool_size;	/* maximum size of pool buffer */
+	__u8 id128[16];		/* the unique id of the bus */
+
+	struct kdbus_item items[0];
+};
+
+/* Flags for kdbus_cmd_{bus,ep,ns}_make */
+enum {
+	KDBUS_MAKE_ACCESS_GROUP		= 1 <<  0,
+	KDBUS_MAKE_ACCESS_WORLD		= 1 <<  1,
+	KDBUS_MAKE_POLICY_OPEN		= 1 <<  2,
 };
 
-struct kdbus_cmd_fname {
+/* Items to append to kdbus_cmd_{bus,ep,ns}_make */
+enum {
+	_KDBUS_MAKE_NULL,
+	KDBUS_MAKE_NAME,
+	KDBUS_MAKE_CRED,	/* allow translator services which connect
+				 * to the bus on behalf of somebody else,
+				 * allow specifying the credentials of the
+				 * client to connect on behalf on. Needs
+				 * privileges */
+};
+
+struct kdbus_cmd_bus_make {
 	__u64 size;
-	__u64 kernel_flags;	/* userspace → kernel, kernel → userspace
-				 * When creating a bus/ns/ep feature
-				 * kernel negotiation done the same
-				 * way as for KDBUS_CMD_BUS_MAKE. */
-	__u64 user_flags;	/* userspace → kernel
+	__u64 flags;		/* userspace → kernel, kernel → userspace
+				 * When creating a bus feature
+				 * kernel negotiation. */
+	__u64 bus_flags;	/* userspace → kernel
 				 * When a bus is created this value is
 				 * copied verbatim into the bus
 				 * structure and returned from
 				 * KDBUS_CMD_HELLO, later */
-	char name[0];
+	__u64 bloom_size;	/* size of the bloom filter for this bus */
+	struct kdbus_item items[0];
+};
+
+struct kdbus_cmd_ep_make {
+	__u64 size;
+	__u64 flags;		/* userspace → kernel, kernel → userspace
+				 * When creating an entry point
+				 * feature kernel negotiation done the
+				 * same way as for
+				 * KDBUS_CMD_BUS_MAKE. Unused for
+				 * now. */
+	struct kdbus_item items[0];
+};
+
+struct kdbus_cmd_ns_make {
+	__u64 size;
+	__u64 flags;		/* userspace → kernel, kernel → userspace
+				 * When creating an entry point
+				 * feature kernel negotiation done the
+				 * same way as for
+				 * KDBUS_CMD_BUS_MAKE. Unused for
+				 * now. */
+	struct kdbus_item items[0];
 };
 
 enum {
 	/* userspace → kernel */
-	KDBUS_CMD_NAME_REPLACE_EXISTING		=  1,
-	KDBUS_CMD_NAME_QUEUE			=  2,
-	KDBUS_CMD_NAME_ALLOW_REPLACEMENT	=  4,
-	KDBUS_CMD_NAME_STEAL_MESSAGES		=  8,
+	KDBUS_NAME_REPLACE_EXISTING		= 1 <<  0,
+	KDBUS_NAME_QUEUE			= 1 <<  1,
+	KDBUS_NAME_ALLOW_REPLACEMENT		= 1 <<  2,
 
 	/* kernel → userspace */
-	KDBUS_CMD_NAME_IN_QUEUE = 0x200,
+	KDBUS_NAME_IN_QUEUE			= 1 << 16,
 };
 
+/* We allow (de)regestration of names of other peers */
 struct kdbus_cmd_name {
 	__u64 size;
 	__u64 flags;
-	__u64 id;		/* We allow registration/deregestration of names of other peers */
+	__u64 id;
+	__u64 conn_flags;
 	char name[0];
 };
 
+enum {
+	KDBUS_NAME_LIST_UNIQUE_NAMES		= 1 <<  0,
+};
+
 struct kdbus_cmd_names {
 	__u64 size;
+	__u64 flags;
 	struct kdbus_cmd_name names[0];
 };
 
 enum {
-	KDBUS_CMD_NAME_INFO_ITEM_NAME,
-	KDBUS_CMD_NAME_INFO_ITEM_SECLABEL,
-	KDBUS_CMD_NAME_INFO_ITEM_AUDIT,
-};
-
-struct kdbus_cmd_name_info_item {
-	__u64 size;
-	__u64 type;
-	__u8 data[0];
+	_KDBUS_NAME_INFO_ITEM_NULL,
+	KDBUS_NAME_INFO_ITEM_NAME,	/* userspace → kernel */
+	KDBUS_NAME_INFO_ITEM_SECLABEL,	/* kernel → userspace */
+	KDBUS_NAME_INFO_ITEM_AUDIT,	/* kernel → userspace */
 };
 
 struct kdbus_cmd_name_info {
 	__u64 size;			/* overall size of info */
-	__u64 flags;
+	__u64 flags;			/* query flags */
+	__u64 attach_flags;		/* which meta data payload to attach */
 	__u64 id;			/* either ID, or 0 and _ITEM_NAME follows */
 	struct kdbus_creds creds;
-	struct kdbus_cmd_name_info_item item[0]; /* list of item records */
+	struct kdbus_item items[0];	/* list of item records */
 };
 
 enum {
-	KDBUS_CMD_MATCH_BLOOM,		/* Matches a mask blob against KDBUS_MSG_BLOOM */
-	KDBUS_CMD_MATCH_SRC_NAME,	/* Matches a name string against KDBUS_MSG_SRC_NAMES */
-	KDBUS_CMD_MATCH_NAME_ADD,	/* Matches a name string against KDBUS_MSG_NAME_ADD */
-	KDBUS_CMD_MATCH_NAME_REMOVE,	/* Matches a name string against KDBUS_MSG_NAME_REMOVE */
-	KDBUS_CMD_MATCH_NAME_CHANGE,	/* Matches a name string against KDBUS_MSG_NAME_CHANGE */
-	KDBUS_CMD_MATCH_ID_ADD,		/* Matches an ID against KDBUS_MSG_ID_ADD */
-	KDBUS_CMD_MATCH_ID_REMOVE,	/* Matches an ID against KDBUS_MSG_ID_REMOVE */
-	KDBUS_CMD_MATCH_ID_CHANGE,	/* Matches an ID against KDBUS_MSG_ID_CHANGE */
-};
-
-struct kdbus_cmd_match_item {
-	__u64 size;
-	__u64 type;
-	__u8 data[0];
+	_KDBUS_MATCH_NULL,
+	KDBUS_MATCH_BLOOM,		/* Matches a mask blob against KDBUS_MSG_BLOOM */
+	KDBUS_MATCH_SRC_NAME,		/* Matches a name string against KDBUS_MSG_SRC_NAMES */
+	KDBUS_MATCH_NAME_ADD,		/* Matches a name string against KDBUS_MSG_NAME_ADD */
+	KDBUS_MATCH_NAME_REMOVE,	/* Matches a name string against KDBUS_MSG_NAME_REMOVE */
+	KDBUS_MATCH_NAME_CHANGE,	/* Matches a name string against KDBUS_MSG_NAME_CHANGE */
+	KDBUS_MATCH_ID_ADD,		/* Matches an ID against KDBUS_MSG_ID_ADD */
+	KDBUS_MATCH_ID_REMOVE,		/* Matches an ID against KDBUS_MSG_ID_REMOVE */
 };
 
 struct kdbus_cmd_match {
@@ -312,12 +398,13 @@ struct kdbus_cmd_match {
 	__u64 id;	/* We allow registration/deregestration of matches for other peers */
 	__u64 cookie;	/* userspace supplied cookie; when removing; kernel deletes everything with same cookie */
 	__u64 src_id;	/* ~0: any. other: exact unique match */
-	struct kdbus_cmd_match_item items[0];
+	struct kdbus_item items[0];
 };
 
 struct kdbus_cmd_monitor {
 	__u64 id;		/* We allow setting the monitor flag of other peers */
-	int enabled;		/* A boolean to enable/disable monitoring */
+	unsigned int enable;	/* A boolean to enable/disable monitoring */
+	__u32 __pad;
 };
 
 /* FD states:
@@ -330,32 +417,37 @@ struct kdbus_cmd_monitor {
  *   starter    (via KDBUS_CMD_HELLO with KDBUS_CMD_HELLO_STARTER)
  *   ep owner   (via KDBUS_CMD_EP_MAKE)
  */
-enum kdbus_cmd {
+enum {
 	/* kdbus control node commands: require unset state */
-	KDBUS_CMD_BUS_MAKE =		_IOWR(KDBUS_IOC_MAGIC, 0x00, struct kdbus_cmd_fname),
-	KDBUS_CMD_NS_MAKE =		_IOWR(KDBUS_IOC_MAGIC, 0x10, struct kdbus_cmd_fname),
-
-	/* kdbus control node commands: require bus owner state */
-	KDBUS_CMD_BUS_POLICY_SET =	_IOWR(KDBUS_IOC_MAGIC, 0x20, struct kdbus_cmd_policy),
+	KDBUS_CMD_BUS_MAKE =		_IOW(KDBUS_IOC_MAGIC, 0x00, struct kdbus_cmd_bus_make),
+	KDBUS_CMD_NS_MAKE =		_IOR(KDBUS_IOC_MAGIC, 0x10, struct kdbus_cmd_ns_make),
 
 	/* kdbus ep node commands: require unset state */
-	KDBUS_CMD_EP_MAKE =		_IOWR(KDBUS_IOC_MAGIC, 0x30, struct kdbus_cmd_fname),
-	KDBUS_CMD_HELLO =		_IOWR(KDBUS_IOC_MAGIC, 0x31, struct kdbus_cmd_hello),
+	KDBUS_CMD_EP_MAKE =		_IOW(KDBUS_IOC_MAGIC, 0x20, struct kdbus_cmd_ep_make),
+	KDBUS_CMD_HELLO =		_IOWR(KDBUS_IOC_MAGIC, 0x30, struct kdbus_cmd_hello),
 
 	/* kdbus ep node commands: require connected state */
-	KDBUS_CMD_MSG_SEND =		_IOWR(KDBUS_IOC_MAGIC, 0x40, struct kdbus_msg),
-	KDBUS_CMD_MSG_RECV =		_IOWR(KDBUS_IOC_MAGIC, 0x41, struct kdbus_msg),
+	KDBUS_CMD_MSG_SEND =		_IOW(KDBUS_IOC_MAGIC, 0x40, struct kdbus_msg),
+	KDBUS_CMD_MSG_RECV =		_IOR(KDBUS_IOC_MAGIC, 0x41, __u64 *),
+	KDBUS_CMD_MSG_RELEASE =		_IOW(KDBUS_IOC_MAGIC, 0x42, __u64 *),
 
 	KDBUS_CMD_NAME_ACQUIRE =	_IOWR(KDBUS_IOC_MAGIC, 0x50, struct kdbus_cmd_name),
-	KDBUS_CMD_NAME_RELEASE =	_IOWR(KDBUS_IOC_MAGIC, 0x51, struct kdbus_cmd_name),
+	KDBUS_CMD_NAME_RELEASE =	_IOW(KDBUS_IOC_MAGIC, 0x51, struct kdbus_cmd_name),
 	KDBUS_CMD_NAME_LIST =		_IOWR(KDBUS_IOC_MAGIC, 0x52, struct kdbus_cmd_names),
 	KDBUS_CMD_NAME_QUERY =		_IOWR(KDBUS_IOC_MAGIC, 0x53, struct kdbus_cmd_name_info),
 
-	KDBUS_CMD_MATCH_ADD =		_IOWR(KDBUS_IOC_MAGIC, 0x60, struct kdbus_cmd_match),
-	KDBUS_CMD_MATCH_REMOVE =	_IOWR(KDBUS_IOC_MAGIC, 0x61, struct kdbus_cmd_match),
-	KDBUS_CMD_MONITOR =		_IOWR(KDBUS_IOC_MAGIC, 0x62, struct kdbus_cmd_monitor),
+	KDBUS_CMD_MATCH_ADD =		_IOW(KDBUS_IOC_MAGIC, 0x60, struct kdbus_cmd_match),
+	KDBUS_CMD_MATCH_REMOVE =	_IOW(KDBUS_IOC_MAGIC, 0x61, struct kdbus_cmd_match),
+	KDBUS_CMD_MONITOR =		_IOW(KDBUS_IOC_MAGIC, 0x62, struct kdbus_cmd_monitor),
 
 	/* kdbus ep node commands: require ep owner state */
-	KDBUS_CMD_EP_POLICY_SET =	_IOWR(KDBUS_IOC_MAGIC, 0x70, struct kdbus_cmd_policy),
+	KDBUS_CMD_EP_POLICY_SET =	_IOW(KDBUS_IOC_MAGIC, 0x70, struct kdbus_cmd_policy),
+
+	/* kdbus memfd commands: */
+	KDBUS_CMD_MEMFD_NEW =		_IOR(KDBUS_IOC_MAGIC, 0x80, int *),
+	KDBUS_CMD_MEMFD_SIZE_GET =	_IOR(KDBUS_IOC_MAGIC, 0x81, __u64 *),
+	KDBUS_CMD_MEMFD_SIZE_SET =	_IOW(KDBUS_IOC_MAGIC, 0x82, __u64 *),
+	KDBUS_CMD_MEMFD_SEAL_GET =	_IOR(KDBUS_IOC_MAGIC, 0x83, int *),
+	KDBUS_CMD_MEMFD_SEAL_SET =	_IO(KDBUS_IOC_MAGIC, 0x84),
 };
 #endif