liveupdate: bug fix for session name and new ioctl to read it
Subsystems (5)
v11 cover liveupdate: bug fix for session name and new ioctl to read it
From: Luca Boccassi <[email protected]>
A series of patches matured while implementing LUO support in userspace in systemd.
- reject session names that are either empty strings or too long
- add new ioctl to retrieve session name from FD, so that userspace can query it without string parsing in procfs
Both changes come with a follow-up patch add test coverage via the existing selftest.
v2: apply one fix from bot review about cleanup on error path:
https://sashiko.dev/#/patchset/20260415184536.1155220-1-luca.boccassi%40gmail.com
the other comments are invalid: luo is not a kmod, and the write hooks are not set up
v3: add test case to liveupdate selftest
v4: split test case in separate follow-up patch
v5: add r-b tag, merge series with LIVEUPDATE_SESSION_GET_NAME ioctl
as they both change the same unit test source file, to avoid merge conflicts add '__u32 reserved' to the UAPI struct
v6: add more test cases as suggested
more verbose commit message
fix docstring
v7: apply suggestion from review bot to stub out setattr ops,
like it was done in 22bdf3d6581a
v8: add new patches to reject session names that are empty or too long
v9: fixes following review comments on LUO_SESSION_MAGIC
v10: split out LUO_SESSION_MAGIC patch as it is undergoing more discussions,
and the other two patches are independent aside from adding test cases to the same unit test source file
v11: rebased on liveupdate/next
reject LIVEUPDATE_SESSION_GET_NAME when 'reserved' is not zero
Luca Boccassi (4):
liveupdate: reject LIVEUPDATE_IOCTL_CREATE_SESSION with invalid name length selftests/liveupdate: add test cases for LIVEUPDATE_IOCTL_CREATE_SESSION calls with invalid length
liveupdate: add LIVEUPDATE_SESSION_GET_NAME ioctl
selftests/liveupdate: add test cases for LIVEUPDATE_SESSION_GET_NAME
include/uapi/linux/liveupdate.h | 21 ++++ kernel/liveupdate/luo_session.c | 20 ++++ .../testing/selftests/liveupdate/liveupdate.c | 113 ++++++++++++++++++ 3 files changed, 154 insertions(+)
Signature · 1 line
2.47.3
PATCH v11 1/4 liveupdate: reject LIVEUPDATE_IOCTL_CREATE_SESSION with invalid name length
From: Luca Boccassi <[email protected]>
A session name must not be an empty string, and must not exceed the maximum size define in the uapi header, including null termination.
--- kernel/liveupdate/luo_session.c | 4 ++++ 1 file changed, 4 insertions(+)
kernel/liveupdate/luo_session.c +4 -0
@@ -382,9 +382,13 @@ static int luo_session_getfile(struct luo_session *session, struct file **filep)int luo_session_create (const char *name,struct file **filep) { +size_t len =strnlen (name,LIVEUPDATE_SESSION_NAME_LENGTH );struct luo_session *session;int err; +if (len ==0 || len >LIVEUPDATE_SESSION_NAME_LENGTH -1 ) +return -EINVAL ; + session =luo_session_alloc (name);if (IS_ERR (session))return PTR_ERR (session);
Signature · 1 line
2.47.3
PATCH v11 2/4 selftests/liveupdate: add test cases for LIVEUPDATE_IOCTL_CREATE_SESSION calls with invalid length
In reply to [email protected]From: Luca Boccassi <[email protected]>
Verify that LIVEUPDATE_IOCTL_CREATE_SESSION ioctl which provide a name that is an empty string or too long are not allowed.
--- .../testing/selftests/liveupdate/liveupdate.c | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+)
tools/testing/selftests/liveupdate/liveupdate.c +42 -0
@@ -386,4 +386,46 @@ TEST_F(liveupdate_device, prevent_double_preservation)ASSERT_EQ (close (session_fd2),0 ); } +/* +* Test Case: Create Session with No Null Termination +* +* Verifies that filling the entire 64-byte name field with non-null characters +* (no '\0' terminator) is rejected by the kernel with EINVAL. +*/ +TEST_F(liveupdate_device, create_session_no_null_termination) +{ +struct liveupdate_ioctl_create_session args = {}; + + self->fd1 =open (LIVEUPDATE_DEV ,O_RDWR ); +if (self->fd1 <0 && errno ==ENOENT ) +SKIP (return,"%s does not exist" ,LIVEUPDATE_DEV ); +ASSERT_GE (self->fd1,0 ); + +/* Fill entire name field with 'X', no null terminator */ + args.size =sizeof (args); +memset (args.name,'X' ,sizeof (args.name)); + +EXPECT_LT (ioctl (self->fd1,LIVEUPDATE_IOCTL_CREATE_SESSION , &args),0 ); +EXPECT_EQ (errno,EINVAL ); +} + +/* +* Test Case: Create Session with Empty Name +* +* Verifies that creating a session with an empty string name fails +* with EINVAL. +*/ +TEST_F(liveupdate_device, create_session_empty_name) +{ +int session_fd; + + self->fd1 =open (LIVEUPDATE_DEV ,O_RDWR ); +if (self->fd1 <0 && errno ==ENOENT ) +SKIP (return,"%s does not exist" ,LIVEUPDATE_DEV ); +ASSERT_GE (self->fd1,0 ); + + session_fd =create_session (self->fd1,"" ); +EXPECT_EQ (session_fd, -EINVAL ); +} +TEST_HARNESS_MAIN
Signature · 1 line
2.47.3
PATCH v11 3/4 liveupdate: add LIVEUPDATE_SESSION_GET_NAME ioctl
In reply to [email protected]From: Luca Boccassi <[email protected]>
Userspace when requesting a session via the ioctl specifies a name and gets a FD, but then there is no ioctl to go back the other way and get the name given a LUO session FD. This is problematic especially when there is a userspace orchestrator that wants to check what FDs it is handling for clients without having to do manual string scraping of procfs, or without procfs at all.
Add a ioctl to simply get the name from an FD.
--- include/uapi/linux/liveupdate.h | 21 +++++++++++++++++++++ kernel/liveupdate/luo_session.c | 16 ++++++++++++++++ 2 files changed, 37 insertions(+)
include/uapi/linux/liveupdate.h +21 -0
@@ -59,6 +59,7 @@ enum {LIVEUPDATE_CMD_SESSION_PRESERVE_FD =LIVEUPDATE_CMD_SESSION_BASE ,LIVEUPDATE_CMD_SESSION_RETRIEVE_FD =0x41 ,LIVEUPDATE_CMD_SESSION_FINISH =0x42 , + LIVEUPDATE_CMD_SESSION_GET_NAME = 0x43, };/**
@@ -213,4 +214,24 @@ struct liveupdate_session_finish {#define LIVEUPDATE_SESSION_FINISH \ _IO(LIVEUPDATE_IOCTL_TYPE, LIVEUPDATE_CMD_SESSION_FINISH) +/** +* struct liveupdate_session_get_name - ioctl(LIVEUPDATE_SESSION_GET_NAME) +* @size: Input; sizeof(struct liveupdate_session_get_name) +* @reserved: Input; Must be zero. Reserved for future use. +* @name: Output; A null-terminated string with the full session name. +* +* Retrieves the full name of the session associated with this file descriptor. +* This is useful because the kernel may truncate the name shown in /proc. +* +* Return: 0 on success, negative error code on failure. +*/ +struct liveupdate_session_get_name { +__u32 size; +__u32 reserved; +__u8 name[LIVEUPDATE_SESSION_NAME_LENGTH ]; +}; + +#define LIVEUPDATE_SESSION_GET_NAME \ + _IO(LIVEUPDATE_IOCTL_TYPE, LIVEUPDATE_CMD_SESSION_GET_NAME) +#endif /* _UAPI_LIVEUPDATE_H */
kernel/liveupdate/luo_session.c +16 -0
@@ -289,10 +289,24 @@ static int luo_session_finish(struct luo_session *session,return luo_ucmd_respond (ucmd,sizeof (*argp)); } +static int luo_session_get_name (struct luo_session *session, +struct luo_ucmd *ucmd) +{ +struct liveupdate_session_get_name *argp = ucmd->cmd; + +if (argp->reserved !=0 ) +return -EINVAL ; + +strscpy ((char *)argp->name, session->name,sizeof (argp->name)); + +return luo_ucmd_respond (ucmd,sizeof (*argp)); +} +union ucmd_buffer {struct liveupdate_session_finish finish;struct liveupdate_session_preserve_fd preserve;struct liveupdate_session_retrieve_fd retrieve; +struct liveupdate_session_get_name get_name; };struct luo_ioctl_op {
@@ -319,6 +333,8 @@ static const struct luo_ioctl_op luo_session_ioctl_ops[] = { struct liveupdate_session_preserve_fd, token),IOCTL_OP (LIVEUPDATE_SESSION_RETRIEVE_FD ,luo_session_retrieve_fd ,struct liveupdate_session_retrieve_fd ,token ), +IOCTL_OP (LIVEUPDATE_SESSION_GET_NAME ,luo_session_get_name , + struct liveupdate_session_get_name, name), }; static long luo_session_ioctl(struct file *filep, unsigned int cmd,
Signature · 1 line
2.47.3
PATCH v11 4/4 selftests/liveupdate: add test cases for LIVEUPDATE_SESSION_GET_NAME
In reply to [email protected]From: Luca Boccassi <[email protected]>
Verify that the new LIVEUPDATE_SESSION_GET_NAME ioctl works as expected via new test cases in the existing liveupdate selftest.
--- .../testing/selftests/liveupdate/liveupdate.c | 71 +++++++++++++++++++ 1 file changed, 71 insertions(+)
tools/testing/selftests/liveupdate/liveupdate.c +71 -0
@@ -102,6 +102,22 @@ static int create_session(int lu_fd, const char *name)return args.fd; } +/* Helper function to get a session name via ioctl. */ +static int get_session_name (int session_fd,char *name,size_t name_len) +{ +struct liveupdate_session_get_name args = {}; + + args.size =sizeof (args); + +if (ioctl (session_fd,LIVEUPDATE_SESSION_GET_NAME , &args)) +return -errno; + +strncpy (name, (char *)args.name, name_len -1 ); + name[name_len -1 ] ='\0' ; + +return 0 ; +} +/* * Test Case: Create Duplicate Session *
@@ -428,4 +444,59 @@ TEST_F(liveupdate_device, create_session_empty_name)EXPECT_EQ (session_fd, -EINVAL ); } +/* +* Test Case: Get Session Name +* +* Verifies that the full session name can be retrieved from a session file +* descriptor via ioctl. +*/ +TEST_F(liveupdate_device, get_session_name) +{ +char name_buf[LIVEUPDATE_SESSION_NAME_LENGTH ] = {}; +const char *session_name ="get-name-test-session" ; +int session_fd; + + self->fd1 =open (LIVEUPDATE_DEV ,O_RDWR ); +if (self->fd1 <0 && errno ==ENOENT ) +SKIP (return,"%s does not exist" ,LIVEUPDATE_DEV ); +ASSERT_GE (self->fd1,0 ); + + session_fd =create_session (self->fd1, session_name); +ASSERT_GE (session_fd,0 ); + +ASSERT_EQ (get_session_name (session_fd, name_buf,sizeof (name_buf)),0 ); +ASSERT_STREQ (name_buf, session_name); + +ASSERT_EQ (close (session_fd),0 ); +} + +/* +* Test Case: Get Session Name at Maximum Length +* +* Verifies that a session name using the full LIVEUPDATE_SESSION_NAME_LENGTH +* (minus the null terminator) can be correctly retrieved. +*/ +TEST_F(liveupdate_device, get_session_name_max_length) +{ +char name_buf[LIVEUPDATE_SESSION_NAME_LENGTH ] = {}; +char long_name[LIVEUPDATE_SESSION_NAME_LENGTH ]; +int session_fd; + +memset (long_name,'A' ,sizeof (long_name) -1 ); + long_name[sizeof (long_name) -1 ] ='\0' ; + + self->fd1 =open (LIVEUPDATE_DEV ,O_RDWR ); +if (self->fd1 <0 && errno ==ENOENT ) +SKIP (return,"%s does not exist" ,LIVEUPDATE_DEV ); +ASSERT_GE (self->fd1,0 ); + + session_fd =create_session (self->fd1, long_name); +ASSERT_GE (session_fd,0 ); + +ASSERT_EQ (get_session_name (session_fd, name_buf,sizeof (name_buf)),0 ); +ASSERT_STREQ (name_buf, long_name); + +ASSERT_EQ (close (session_fd),0 ); +} +TEST_HARNESS_MAIN
Signature · 1 line
2.47.3
Quoted 10 lines · On Wed, 29 Apr 2026 22:21:13 +0100, [email protected] wrote:
From: Luca Boccassi <[email protected]>
A series of patches matured while implementing LUO support in userspace in systemd.
- reject session names that are either empty strings or too long
- add new ioctl to retrieve session name from FD, so that userspace can query it without string parsing in procfs[...]
Applied, thanks!
[1/4] liveupdate: reject LIVEUPDATE_IOCTL_CREATE_SESSION with invalid name length
commit: a0a79b4272161f587923cfe8484c3812196a457e
[2/4] selftests/liveupdate: add test cases for LIVEUPDATE_IOCTL_CREATE_SESSION calls with invalid length
commit: 5a42660ffc155baa4f5c574d052885ce59f33387
[3/4] liveupdate: add LIVEUPDATE_SESSION_GET_NAME ioctl
commit: d6b3d47bdaf89f29682d9044d21ad1451384f7e4
[4/4] selftests/liveupdate: add test cases for LIVEUPDATE_SESSION_GET_NAME
commit: 7ac15eb18f91fe0796c3556f372c6b3ac752dceeBest regards,
Signature · 1 line
Pasha Tatashin <[email protected]>