* [PATCH] x86/PCI: Use struct_size()
@ 2023-05-19 17:42 Christophe JAILLET
2023-07-13 16:34 ` Bjorn Helgaas
0 siblings, 1 reply; 2+ messages in thread
From: Christophe JAILLET @ 2023-05-19 17:42 UTC (permalink / raw)
To: Bjorn Helgaas, Thomas Gleixner, Ingo Molnar, Borislav Petkov,
Dave Hansen, x86, H. Peter Anvin
Cc: linux-kernel, kernel-janitors, Christophe JAILLET, linux-pci
Use struct_size() instead of hand-writing it. It is less verbose, more
robust and more informative.
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
arch/x86/pci/irq.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/x86/pci/irq.c b/arch/x86/pci/irq.c
index a498b847d740..0de436316a1d 100644
--- a/arch/x86/pci/irq.c
+++ b/arch/x86/pci/irq.c
@@ -136,14 +136,14 @@ static inline struct irq_routing_table *pirq_convert_irt_table(u8 *addr,
if (ir->signature != IRT_SIGNATURE || !ir->used || ir->size < ir->used)
return NULL;
- size = sizeof(*ir) + ir->used * sizeof(ir->slots[0]);
+ size = struct_size(ir, slots, ir->used);
if (size > limit - addr)
return NULL;
DBG(KERN_DEBUG "PCI: $IRT Interrupt Routing Table found at 0x%lx\n",
__pa(ir));
- size = sizeof(*rt) + ir->used * sizeof(rt->slots[0]);
+ size = struct_size(rt, slots, ir->used);
rt = kzalloc(size, GFP_KERNEL);
if (!rt)
return NULL;
--
2.34.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] x86/PCI: Use struct_size()
2023-05-19 17:42 [PATCH] x86/PCI: Use struct_size() Christophe JAILLET
@ 2023-07-13 16:34 ` Bjorn Helgaas
0 siblings, 0 replies; 2+ messages in thread
From: Bjorn Helgaas @ 2023-07-13 16:34 UTC (permalink / raw)
To: Christophe JAILLET
Cc: Bjorn Helgaas, Thomas Gleixner, Ingo Molnar, Borislav Petkov,
Dave Hansen, x86, H. Peter Anvin, linux-kernel, kernel-janitors,
linux-pci
On Fri, May 19, 2023 at 07:42:28PM +0200, Christophe JAILLET wrote:
> Use struct_size() instead of hand-writing it. It is less verbose, more
> robust and more informative.
>
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Applied to pci/misc for v6.6, thanks!
> ---
> arch/x86/pci/irq.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/x86/pci/irq.c b/arch/x86/pci/irq.c
> index a498b847d740..0de436316a1d 100644
> --- a/arch/x86/pci/irq.c
> +++ b/arch/x86/pci/irq.c
> @@ -136,14 +136,14 @@ static inline struct irq_routing_table *pirq_convert_irt_table(u8 *addr,
> if (ir->signature != IRT_SIGNATURE || !ir->used || ir->size < ir->used)
> return NULL;
>
> - size = sizeof(*ir) + ir->used * sizeof(ir->slots[0]);
> + size = struct_size(ir, slots, ir->used);
> if (size > limit - addr)
> return NULL;
>
> DBG(KERN_DEBUG "PCI: $IRT Interrupt Routing Table found at 0x%lx\n",
> __pa(ir));
>
> - size = sizeof(*rt) + ir->used * sizeof(rt->slots[0]);
> + size = struct_size(rt, slots, ir->used);
> rt = kzalloc(size, GFP_KERNEL);
> if (!rt)
> return NULL;
> --
> 2.34.1
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-07-13 16:34 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-05-19 17:42 [PATCH] x86/PCI: Use struct_size() Christophe JAILLET
2023-07-13 16:34 ` Bjorn Helgaas
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox