shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-10 05:18:17 +03:00
Code

dm-util: get rid of flex array in middle of structure

Browse Source 
Fixes: #33936
This commit is contained in:
Lennart Poettering 2024-09-06 22:03:01 +02:00 committed by Yu Watanabe
parent 71f43fc882
commit 925095a6db
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/shared/dm-util.c
View File

@ -10,29 +10,37 @@
int dm_deferred_remove_cancel(const char *name) {
_cleanup_close_ int fd = -EBADF;
struct message {
struct combined {
struct dm_ioctl dm_ioctl;
struct dm_target_msg dm_target_msg;
char msg_text[STRLEN("@cancel_deferred_remove") + 1];
} _packed_ message = {
.dm_ioctl = {
} _packed_;
union message {
struct combined combined;
struct {
uint8_t space[offsetof(struct combined, dm_target_msg.message)];
char text[STRLEN("@cancel_deferred_remove") + 1];
} _packed_;
} message = {
.combined.dm_ioctl = {
.version = {
DM_VERSION_MAJOR,
DM_VERSION_MINOR,
DM_VERSION_PATCHLEVEL
},
.data_size = sizeof(struct message),
.data_start = sizeof(struct dm_ioctl),
.data_size = sizeof(union message),
.data_start = offsetof(union message, combined.dm_target_msg),
},
.msg_text = "@cancel_deferred_remove",
};
assert(name);
if (strlen(name) >= sizeof(message.dm_ioctl.name))
if (strlen(name) >= sizeof(message.combined.dm_ioctl.name))
return -ENODEV; /* A device with a name longer than this cannot possibly exist */
strncpy_exact(message.dm_ioctl.name, name, sizeof(message.dm_ioctl.name));
strncpy_exact(message.combined.dm_ioctl.name, name, sizeof(message.combined.dm_ioctl.name));
strncpy_exact(message.text, "@cancel_deferred_remove", sizeof(message.text));
fd = open("/dev/mapper/control", O_RDWR|O_CLOEXEC);
if (fd < 0)