morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-15 08:56:15 +09:00
Code Issues Packages Projects Releases Wiki Activity

tree-wide: allow building with -Wgnu-variable-sized-type-not-at-end option for clang (#37499)

Browse Source 
Follow-up for #36993.
Closes #37497.
This commit is contained in:
Yu Watanabe
2025-06-07 01:02:38 +09:00
committed by GitHub
parent 687a92a1b6 e311402d4a
commit 6c2558a2fc
6 changed files with 29 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
meson.build
View File

@@ -489,7 +489,6 @@ endif
if cc.get_id() == 'clang'
possible_common_cc_flags += [
'-Wno-typedef-redefinition',
'-Wno-gnu-variable-sized-type-not-at-end',
]
endif

4
src/libsystemd-network/dhcp-client-id-internal.h
View File

@@ -32,7 +32,7 @@ typedef struct sd_dhcp_client_id {
} _packed_ eth;
struct {
/* 2 - 254: ARP/Link-Layer (RFC 2132) */
uint8_t haddr[0];
uint8_t haddr[HW_ADDR_MAX_SIZE];
} _packed_ ll;
struct {
/* 255: Node-specific (RFC 4361) */
@@ -46,6 +46,8 @@ typedef struct sd_dhcp_client_id {
};
} sd_dhcp_client_id;
assert_cc(sizeof_field(sd_dhcp_client_id, id) <= MAX_CLIENT_ID_LEN);
static inline bool client_id_size_is_valid(size_t size) {
return size >= MIN_CLIENT_ID_LEN && size <= MAX_CLIENT_ID_LEN;
}

10
src/libsystemd-network/dhcp-duid-internal.h
View File

@@ -36,17 +36,19 @@ struct duid {
/* DUID_TYPE_LLT */
be16_t htype;
be32_t time;
uint8_t haddr[];
uint8_t haddr[HW_ADDR_MAX_SIZE];
} _packed_ llt;
struct {
/* DUID_TYPE_EN */
be32_t pen;
uint8_t id[];
/* The maximum length of vendor ID is not provided in RFC 8415, but we use 8 bytes.
* See https://datatracker.ietf.org/doc/html/rfc8415#section-11.3 */
uint8_t id[8];
} _packed_ en;
struct {
/* DUID_TYPE_LL */
be16_t htype;
uint8_t haddr[];
uint8_t haddr[HW_ADDR_MAX_SIZE];
} _packed_ ll;
struct {
/* DUID_TYPE_UUID */
@@ -56,6 +58,8 @@ struct duid {
};
} _packed_;
assert_cc(sizeof(struct duid) == MAX_DUID_LEN);
typedef struct sd_dhcp_duid {
size_t size;
union {

9
src/libsystemd/sd-event/event-source.h
View File

@@ -220,10 +220,6 @@ struct inotify_data {
Hashmap *inodes; /* The inode_data structures keyed by dev+ino */
Hashmap *wd; /* The inode_data structures keyed by the watch descriptor for each */
/* The buffer we read inotify events into */
union inotify_event_buffer buffer;
size_t buffer_filled; /* fill level of the buffer */
/* How many event sources are currently marked pending for this inotify. We won't read new events off the
* inotify fd as long as there are still pending events on the inotify (because we have no strategy of queuing
* the events locally if they can't be coalesced). */
@@ -237,4 +233,9 @@ struct inotify_data {
/* A linked list of all inotify objects with data already read, that still need processing. We keep this list
* to make it efficient to figure out what inotify objects to process data on next. */
LIST_FIELDS(struct inotify_data, buffered);
/* The buffer we read inotify events into */
size_t buffer_filled; /* fill level of the buffer */
union inotify_event_buffer buffer; /* struct inotify_event in union inotify_event_buffer has flex
* array. Hence, this must be at the end. */
};

20
src/libsystemd/sd-journal/journal-def.h
View File

@@ -55,7 +55,8 @@ struct ObjectHeader {
uint8_t flags;
uint8_t reserved[6];
le64_t size;
uint8_t payload[];
uint8_t payload[0]; /* The struct is embedded in other objects, hence flex array (i.e. payload[])
* cannot be used. */
} _packed_;
#define DataObject__contents { \
@@ -103,18 +104,13 @@ assert_cc(sizeof(struct FieldObject) == sizeof(struct FieldObject__packed));
le64_t xor_hash; \
union { \
struct { \
dummy_t __empty__regular; \
struct { \
le64_t object_offset; \
le64_t hash; \
} regular[]; \
}; \
le64_t object_offset; \
le64_t hash; \
} regular[0]; /* this is an array; since we are not allowed to place a variable sized array
* in a union, we just zero-size it, even if it is generally longer. */ \
struct { \
dummy_t __empty_compact; \
struct { \
le32_t object_offset; \
} compact[]; \
}; \
le32_t object_offset; \
} compact[0]; \
} items; \
}

12
src/libsystemd/sd-journal/journal-file.c
View File

@@ -595,7 +595,7 @@ static int journal_file_verify_header(JournalFile *f) {
return -ENODATA;
if (header_size + arena_size < tail_object_offset)
return -ENODATA;
if (header_size + arena_size - tail_object_offset < sizeof(ObjectHeader))
if (header_size + arena_size - tail_object_offset < offsetof(ObjectHeader, payload))
return -ENODATA;
if (!hash_table_is_valid(le64toh(f->header->data_hash_table_offset),
@@ -661,7 +661,7 @@ static int journal_file_verify_header(JournalFile *f) {
/* Verify number of objects */
uint64_t n_objects = le64toh(f->header->n_objects);
if (n_objects > arena_size / sizeof(ObjectHeader))
if (n_objects > arena_size / offsetof(ObjectHeader, payload))
return -ENODATA;
uint64_t n_entries = le64toh(f->header->n_entries);
@@ -883,7 +883,7 @@ static uint64_t minimum_header_size(JournalFile *f, Object *o) {
return journal_file_data_payload_offset(f);
if (o->object.type >= ELEMENTSOF(table) || table[o->object.type] <= 0)
return sizeof(ObjectHeader);
return offsetof(ObjectHeader, payload);
return table[o->object.type];
}
@@ -900,7 +900,7 @@ static int check_object_header(JournalFile *f, Object *o, ObjectType type, uint6
"Attempt to move to uninitialized object: %" PRIu64,
offset);
if (s < sizeof(ObjectHeader))
if (s < offsetof(ObjectHeader, payload))
return log_debug_errno(SYNTHETIC_ERRNO(EBADMSG),
"Attempt to move to overly short object with size %"PRIu64": %" PRIu64,
s, offset);
@@ -1106,7 +1106,7 @@ int journal_file_move_to_object(JournalFile *f, ObjectType type, uint64_t offset
journal_object_type_to_string(type),
offset);
r = journal_file_move_to(f, type, false, offset, sizeof(ObjectHeader), (void**) &o);
r = journal_file_move_to(f, type, false, offset, offsetof(ObjectHeader, payload), (void**) &o);
if (r < 0)
return r;
@@ -1238,7 +1238,7 @@ int journal_file_append_object(
assert(f);
assert(f->header);
assert(type > OBJECT_UNUSED && type < _OBJECT_TYPE_MAX);
assert(size >= sizeof(ObjectHeader));
assert(size >= offsetof(ObjectHeader, payload));
r = journal_file_set_online(f);
if (r < 0)