Skip to content

Commit a094708

Browse files
GustavoARSilvasuryasaimadhu
authored andcommitted
x86/uv/time: Use a flexible array in struct uv_rtc_timer_head
There is a regular need in the kernel to provide a way to declare having a dynamically sized set of trailing elements in a structure. Kernel code should always use “flexible array members”[1] for these cases. The older style of one-element or zero-length arrays should no longer be used[2]. struct uv_rtc_timer_head contains a one-element array cpu[1]. Switch it to a flexible array and use the struct_size() helper to calculate the allocation size. Also, save some heap space in the process[3]. [1] https://en.wikipedia.org/wiki/Flexible_array_member [2] https://www.kernel.org/doc/html/v5.9-rc1/process/deprecated.html#zero-length-and-one-element-arrays [3] https://lore.kernel.org/lkml/20200518190114.GA7757@embeddedor/ [ bp: Massage a bit. ] Signed-off-by: Gustavo A. R. Silva <[email protected]> Signed-off-by: Borislav Petkov <[email protected]> Reviewed-by: Kees Cook <[email protected]> Cc: Steve Wahl <[email protected]> Link: https://lkml.kernel.org/r/20201001145608.GA10204@embeddedor
1 parent a1b8638 commit a094708

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

arch/x86/platform/uv/uv_time.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ struct uv_rtc_timer_head {
5252
struct {
5353
int lcpu; /* systemwide logical cpu number */
5454
u64 expires; /* next timer expiration for this cpu */
55-
} cpu[1];
55+
} cpu[];
5656
};
5757

5858
/*
@@ -148,9 +148,8 @@ static __init int uv_rtc_allocate_timers(void)
148148
struct uv_rtc_timer_head *head = blade_info[bid];
149149

150150
if (!head) {
151-
head = kmalloc_node(sizeof(struct uv_rtc_timer_head) +
152-
(uv_blade_nr_possible_cpus(bid) *
153-
2 * sizeof(u64)),
151+
head = kmalloc_node(struct_size(head, cpu,
152+
uv_blade_nr_possible_cpus(bid)),
154153
GFP_KERNEL, nid);
155154
if (!head) {
156155
uv_rtc_deallocate_timers();

0 commit comments

Comments
 (0)