liveupdate: add LUO_SESSION_MAGIC magic inode type
Subsystems (4)
PATCH v7 1/4 liveupdate: add LUO_SESSION_MAGIC magic inode type
From: Luca Boccassi <[email protected]>
In userspace when managing LUO sessions we want to be able to identify a FD as a LUO session, in order to be able to do the special handling that they require in order to function as intended on kexec.
Currently this requires scraping procfs and doing string matching on the prefix of the dname, which is not an ideal interface.
Add a singleton inode type with a magic value, so that we can programmatically identify a fd as a LUO session via fstatfs().
---
This was requested by Lennart and Christian when discussing integration with systemd for LUO management.
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
v7: apply suggestion from review bot to stub out setattr ops,
like it was done in 22bdf3d6581a
include/uapi/linux/magic.h | 1 + kernel/liveupdate/luo_core.c | 10 +++- kernel/liveupdate/luo_internal.h | 2 + kernel/liveupdate/luo_session.c | 89 ++++++++++++++++++++++++++++++-- 4 files changed, 96 insertions(+), 6 deletions(-)
include/uapi/linux/magic.h +1 -0
@@ -105,5 +105,6 @@#define PID_FS_MAGIC 0x50494446/* "PIDF" */ #define GUEST_MEMFD_MAGIC 0x474d454d/* "GMEM" */ #define NULL_FS_MAGIC 0x4E554C4C/* "NULL" */ +#define LUO_SESSION_MAGIC 0x4c554f53/* "LUOS" */ #endif /* __LINUX_MAGIC_H__ */
kernel/liveupdate/luo_core.c +9 -1
@@ -197,9 +197,17 @@ static int __init luo_late_startup(void)if (!liveupdate_enabled ())return 0 ; + err =luo_session_fs_init (); +if (err) { + luo_global.enabled = false; +return err; + } + err =luo_fdt_setup (); -if (err) +if (err) { +luo_session_fs_cleanup (); luo_global.enabled = false; + }return err; }
kernel/liveupdate/luo_internal.h +2 -0
@@ -79,6 +79,8 @@ struct luo_session {int luo_session_create (const char *name,struct file **filep);int luo_session_retrieve (const char *name,struct file **filep); +int __init luo_session_fs_init (void ); +void __init luo_session_fs_cleanup (void );int __init luo_session_setup_outgoing (void *fdt);int __init luo_session_setup_incoming (void *fdt);int luo_session_serialize (void );
kernel/liveupdate/luo_session.c +84 -5
119 lines not on this page · raw message
Signature · 1 line
2.47.3
PATCH v7 2/4 selftests/liveupdate: add test case for LUO_SESSION_MAGIC
From: Luca Boccassi <[email protected]>
Verify that fstat works as expected after the switch from anon_inode to the new magic number.
---
v4: split test case in separate patch, reorder variable declarations
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
.../testing/selftests/liveupdate/liveupdate.c | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+)
tools/testing/selftests/liveupdate/liveupdate.c +40 -0
@@ -22,9 +22,12 @@#include <fcntl.h> #include <string.h> #include <sys/ioctl.h> +#include <sys/stat.h> +#include <sys/vfs.h> #include <unistd.h> #include <linux/liveupdate.h> +#include <linux/magic.h> #include "../kselftest.h" #include "../kselftest_harness.h"
@@ -345,4 +348,41 @@ TEST_F(liveupdate_device, preserve_unsupported_fd)ASSERT_EQ (close (session_fd),0 ); } +/* +* Test Case: Session fstat +* +* Verifies that fstatfs() on a session file descriptor reports the +* LUO_SESSION_MAGIC filesystem type, and that fstat() returns consistent +* inode numbers across different sessions (shared singleton inode). +*/ +TEST_F(liveupdate_device, session_fstat) +{ +int session_fd1, session_fd2; +struct stat st1, st2; +struct statfs sfs; + + 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_fd1 =create_session (self->fd1,"fstat-session-1" ); +ASSERT_GE (session_fd1,0 ); + + session_fd2 =create_session (self->fd1,"fstat-session-2" ); +ASSERT_GE (session_fd2,0 ); + +/* Verify the filesystem type is LUO_SESSION_MAGIC */ +ASSERT_EQ (fstatfs (session_fd1, &sfs),0 ); +EXPECT_EQ (sfs.f_type,LUO_SESSION_MAGIC ); + +/* Verify both sessions share the same inode number */ +ASSERT_EQ (fstat (session_fd1, &st1),0 ); +ASSERT_EQ (fstat (session_fd2, &st2),0 ); +EXPECT_EQ (st1.st_ino, st2.st_ino); + +ASSERT_EQ (close (session_fd1),0 ); +ASSERT_EQ (close (session_fd2),0 ); +} +TEST_HARNESS_MAIN
Signature · 1 line
2.47.3
PATCH v7 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.
---
v5: merge with LUO_SESSION_MAGIC series as they both change the same
unit test file, to avoid merge conflicts
add '__u32 reserved' to the UAPI struct
v6: fix docstring
include/uapi/linux/liveupdate.h | 21 +++++++++++++++++++++ kernel/liveupdate/luo_session.c | 13 +++++++++++++ 2 files changed, 34 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 +13 -0
@@ -291,10 +291,21 @@ 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; + +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 {
@@ -321,6 +332,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
Re: [PATCH v7 3/4] liveupdate: add LIVEUPDATE_SESSION_GET_NAME ioctl
Quoted 97 lines · On 04-18 15:09, [email protected] wrote:
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.
Signed-off-by Luca Boccassi <[email protected]>---
v5: merge withLUO_SESSION_MAGICseries as they both change the same
unit test file, to avoid merge conflicts
add '__u32reserved' to the UAPI struct
v6: fix docstringinclude/uapi/linux/liveupdate.h | 21 +++++++++++++++++++++ kernel/liveupdate/luo_session.c | 13 +++++++++++++ 2 files changed, 34 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 +13
-0@@ -291,10 +291,21 @@ 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; + +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 {@@ -321,6 +332,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 v7 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.
---
v5: merge with LUO_SESSION_MAGIC series as they both change the same
unit test file, to avoid merge conflicts
split into separate patch
v6: add more test cases as suggested
more verbose commit message
.../testing/selftests/liveupdate/liveupdate.c | 138 ++++++++++++++++++ 1 file changed, 138 insertions(+)
tools/testing/selftests/liveupdate/liveupdate.c +138 -0
@@ -105,6 +105,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 *
@@ -385,4 +401,126 @@ TEST_F(liveupdate_device, session_fstat)ASSERT_EQ (close (session_fd2),0 ); } +/* +* 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 Case: Create Session with No Null Termination +* +* Verifies that filling the entire 64-byte name field with non-null characters +* (no '\0' terminator) is handled safely by the kernel. The kernel's strscpy +* truncates to 63 characters, which we verify via get_session_name. +*/ +TEST_F(liveupdate_device, create_session_no_null_termination) +{ +struct liveupdate_ioctl_create_session args = {}; +char expected_name[LIVEUPDATE_SESSION_NAME_LENGTH ]; +char name_buf[LIVEUPDATE_SESSION_NAME_LENGTH ] = {}; +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 ); + +/* Fill entire name field with 'X', no null terminator */ + args.size =sizeof (args); +memset (args.name,'X' ,sizeof (args.name)); + +ASSERT_EQ (ioctl (self->fd1,LIVEUPDATE_IOCTL_CREATE_SESSION , &args),0 ); + session_fd = args.fd; +ASSERT_GE (session_fd,0 ); + +/* Kernel should have truncated to 63 chars + '\0' */ +memset (expected_name,'X' ,sizeof (expected_name) -1 ); + expected_name[sizeof (expected_name) -1 ] ='\0' ; + +ASSERT_EQ (get_session_name (session_fd, name_buf,sizeof (name_buf)),0 ); +ASSERT_STREQ (name_buf, expected_name); + +ASSERT_EQ (close (session_fd),0 ); +} + +/* +* Test Case: Create Session with Empty Name +* +* Verifies that creating a session with an empty string name succeeds, +* and that creating a second session with the same empty name fails +* with EEXIST. +*/ +TEST_F(liveupdate_device, create_session_empty_name) +{ +char name_buf[LIVEUPDATE_SESSION_NAME_LENGTH ] = {}; +int session_fd1, session_fd2; + + 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_fd1 =create_session (self->fd1,"" ); +ASSERT_GE (session_fd1,0 ); + +ASSERT_EQ (get_session_name (session_fd1, name_buf,sizeof (name_buf)),0 ); +ASSERT_STREQ (name_buf,"" ); + +/* A second empty-name session must fail as duplicate */ + session_fd2 =create_session (self->fd1,"" ); +EXPECT_EQ (session_fd2, -EEXIST ); + +ASSERT_EQ (close (session_fd1),0 ); +} +TEST_HARNESS_MAIN
Signature · 1 line
2.47.3
Pasha Tatashin
maintainerRe: [PATCH v7 4/4] selftests/liveupdate: add test cases for LIVEUPDATE_SESSION_GET_NAME
Quoted 108 lines · On 04-18 15:09, [email protected] wrote:
From: Luca Boccassi <[email protected]>
Verify that the new
LIVEUPDATE_SESSION_GET_NAMEioctl works as expected via new test cases in the existing liveupdate selftest.Signed-off-by Luca Boccassi <[email protected]>---
v5: merge withLUO_SESSION_MAGICseries as they both change the same
unit test file, to avoid merge conflicts
split into separate patch
v6: add more test cases as suggested
more verbose commit message.../testing/selftests/liveupdate/liveupdate.c | 138 ++++++++++++++++++ 1 file changed, 138 insertions(+)tools/testing/selftests/liveupdate/liveupdate.c +77
-0@@ -105,6 +105,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 * @@ -385,4 +401,126 @@ TEST_F(liveupdate_device, session_fstat)ASSERT_EQ (close (session_fd2),0 ); } +/* +* 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 Case: Create Session with No Null Termination +* +* Verifies that filling the entire 64-byte name field with non-null characters +* (no '\0' terminator) is handled safely by the kernel. The kernel's strscpy +* truncates to 63 characters, which we verify via get_session_name.
[...]
Quoted 28 lines
+ */
tools/testing/selftests/liveupdate/liveupdate.c +27
-0+TEST_F(liveupdate_device, create_session_no_null_termination) +{ +struct liveupdate_ioctl_create_session args = {}; +char expected_name[LIVEUPDATE_SESSION_NAME_LENGTH ]; +char name_buf[LIVEUPDATE_SESSION_NAME_LENGTH ] = {}; +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 ); + +/* Fill entire name field with 'X', no null terminator */ + args.size =sizeof (args); +memset (args.name,'X' ,sizeof (args.name)); + +ASSERT_EQ (ioctl (self->fd1,LIVEUPDATE_IOCTL_CREATE_SESSION , &args),0 ); + session_fd = args.fd; +ASSERT_GE (session_fd,0 ); + +/* Kernel should have truncated to 63 chars + '\0' */ +memset (expected_name,'X' ,sizeof (expected_name) -1 ); + expected_name[sizeof (expected_name) -1 ] ='\0' ; + +ASSERT_EQ (get_session_name (session_fd, name_buf,sizeof (name_buf)),0 ); +ASSERT_STREQ (name_buf, expected_name); +
tools/testing/selftests/liveupdate/liveupdate.c TEST_F(liveupdate_device, session_fstat) · line 502
Quoted 10 lines
tools/testing/selftests/liveupdate/liveupdate.c +10
-0+ASSERT_EQ (close (session_fd),0 ); +} + +/* +* Test Case: Create Session with Empty Name +* +* Verifies that creating a session with an empty string name succeeds, +* and that creating a second session with the same empty name fails +* with EEXIST. +*/
For the two cases mentioned above, we should implement a fix in the kernel:
In luo_session_create(), we should verify that the name is at least 1 character long and at most LIVEUPDATE_SESSION_NAME_LENGTH - 1.
size_t len = strnlen(name, LIVEUPDATE_SESSION_NAME_LENGTH);
if (!len || len > LIVEUPDATE_SESSION_NAME_LENGTH - 1)
return -EINVAL;
This change should be submitted as a separate patch in your series.
Additionally, please include a cover letter in the next version explaining the overall series. Once the cover letter is included, you can remove the individual patch versions from the stat areas.
Pasha
Re: [PATCH v7 4/4] selftests/liveupdate: add test cases for LIVEUPDATE_SESSION_GET_NAME
Quoted 163 lines · Pasha Tatashin
Quoted 108 lines · On 04-18 15:09, [email protected] wrote:
From: Luca Boccassi <[email protected]>
Verify that the new
LIVEUPDATE_SESSION_GET_NAMEioctl works as expected via new test cases in the existing liveupdate selftest.Signed-off-by Luca Boccassi <[email protected]>---
v5: merge withLUO_SESSION_MAGICseries as they both change the same
unit test file, to avoid merge conflicts
split into separate patch
v6: add more test cases as suggested
more verbose commit message.../testing/selftests/liveupdate/liveupdate.c | 138 ++++++++++++++++++ 1 file changed, 138 insertions(+)tools/testing/selftests/liveupdate/liveupdate.c +77
-0@@ -105,6 +105,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 * @@ -385,4 +401,126 @@ TEST_F(liveupdate_device, session_fstat)ASSERT_EQ (close (session_fd2),0 ); } +/* +* 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 Case: Create Session with No Null Termination +* +* Verifies that filling the entire 64-byte name field with non-null characters +* (no '\0' terminator) is handled safely by the kernel. The kernel's strscpy +* truncates to 63 characters, which we verify via get_session_name. [...]
Quoted 28 lines
+ */
tools/testing/selftests/liveupdate/liveupdate.c +27
-0+TEST_F(liveupdate_device, create_session_no_null_termination) +{ +struct liveupdate_ioctl_create_session args = {}; +char expected_name[LIVEUPDATE_SESSION_NAME_LENGTH ]; +char name_buf[LIVEUPDATE_SESSION_NAME_LENGTH ] = {}; +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 ); + +/* Fill entire name field with 'X', no null terminator */ + args.size =sizeof (args); +memset (args.name,'X' ,sizeof (args.name)); + +ASSERT_EQ (ioctl (self->fd1,LIVEUPDATE_IOCTL_CREATE_SESSION , &args),0 ); + session_fd = args.fd; +ASSERT_GE (session_fd,0 ); + +/* Kernel should have truncated to 63 chars + '\0' */ +memset (expected_name,'X' ,sizeof (expected_name) -1 ); + expected_name[sizeof (expected_name) -1 ] ='\0' ; + +ASSERT_EQ (get_session_name (session_fd, name_buf,sizeof (name_buf)),0 ); +ASSERT_STREQ (name_buf, expected_name); +tools/testing/selftests/liveupdate/liveupdate.c TEST_F(liveupdate_device, session_fstat) · line 502
Quoted 10 lines
tools/testing/selftests/liveupdate/liveupdate.c +10
-0+ASSERT_EQ (close (session_fd),0 ); +} + +/* +* Test Case: Create Session with Empty Name +* +* Verifies that creating a session with an empty string name succeeds, +* and that creating a second session with the same empty name fails +* with EEXIST. +*/ For the two cases mentioned above, we should implement a fix in the kernel:
In
luo_session_create(), we should verify that the name is at least 1 character long and at mostLIVEUPDATE_SESSION_NAME_LENGTH- 1.
size_tlen =strnlen(name, LIVEUPDATE_SESSION_NAME_LENGTH);if (!len || len >
LIVEUPDATE_SESSION_NAME_LENGTH- 1)
return-EINVAL;
Quoted 7 lines
This change should be submitted as a separate patch in your series.
Additionally, please include a cover letter in the next version explaining the overall series. Once the cover letter is included, you can remove the individual patch versions from the stat areas.
Pasha
Ok, all done in v8, thanks