summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMinghao Chi (CGEL ZTE) <chi.minghao@zte.com.cn>2022-02-10 09:10:08 +0300
committerDavid S. Miller <davem@davemloft.net>2022-02-10 18:37:47 +0300
commitd8c2858181ccf0ca506b75ffe1ffab25a090d0e4 (patch)
treeff6478c9f953cdd891dd8d8dc0fea097560e8957
parentdc513a405cade3e47bcda8de27c7a7bf6eeddd18 (diff)
downloadlinux-d8c2858181ccf0ca506b75ffe1ffab25a090d0e4.tar.xz
net/switchdev: use struct_size over open coded arithmetic
Replace zero-length array with flexible-array member and make use of the struct_size() helper in kmalloc(). For example: struct switchdev_deferred_item { ... unsigned long data[]; }; Make use of the struct_size() helper instead of an open-coded version in order to avoid any potential type mistakes. Reported-by: Zeal Robot <zealci@zte.com.cn> Signed-off-by: Minghao Chi (CGEL ZTE) <chi.minghao@zte.com.cn> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/switchdev/switchdev.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c
index b62565278fac..12e6b4146bfb 100644
--- a/net/switchdev/switchdev.c
+++ b/net/switchdev/switchdev.c
@@ -85,7 +85,7 @@ static int switchdev_deferred_enqueue(struct net_device *dev,
{
struct switchdev_deferred_item *dfitem;
- dfitem = kmalloc(sizeof(*dfitem) + data_len, GFP_ATOMIC);
+ dfitem = kmalloc(struct_size(dfitem, data, data_len), GFP_ATOMIC);
if (!dfitem)
return -ENOMEM;
dfitem->dev = dev;