Commit 29adeb4f authored by Gustavo A. R. Silva's avatar Gustavo A. R. Silva Committed by Heiko Stuebner

drm/rockchip: Use struct_size() in devm_kzalloc()

One of the more common cases of allocation size calculations is finding
the size of a structure that has a zero-sized array at the end, along
with memory for some number of elements for that array. For example:

struct foo {
	int stuff;
        void *entry[];
};

instance = devm_kzalloc(dev, sizeof(struct foo) + sizeof(void *) * count, GFP_KERNEL);

or, like in this particular case:

size = sizeof(struct foo) + sizeof(void *) * count;
instance = devm_kzalloc(dev, size, GFP_KERNEL);

Instead of leaving these open-coded and prone to type mistakes, we can
now use the new struct_size() helper:

instance = devm_kzalloc(dev, struct_size(instance, entry, count),
GFP_KERNEL);

This issue was detected with the help of Coccinelle.
Signed-off-by: default avatarGustavo A. R. Silva <gustavo@embeddedor.com>
Reviewed-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20180826184712.GA9330@embeddedor.com
parent dc879f61
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
#include <linux/of_device.h> #include <linux/of_device.h>
#include <linux/pm_runtime.h> #include <linux/pm_runtime.h>
#include <linux/component.h> #include <linux/component.h>
#include <linux/overflow.h>
#include <linux/reset.h> #include <linux/reset.h>
#include <linux/delay.h> #include <linux/delay.h>
...@@ -1579,7 +1580,6 @@ static int vop_bind(struct device *dev, struct device *master, void *data) ...@@ -1579,7 +1580,6 @@ static int vop_bind(struct device *dev, struct device *master, void *data)
struct drm_device *drm_dev = data; struct drm_device *drm_dev = data;
struct vop *vop; struct vop *vop;
struct resource *res; struct resource *res;
size_t alloc_size;
int ret, irq; int ret, irq;
vop_data = of_device_get_match_data(dev); vop_data = of_device_get_match_data(dev);
...@@ -1587,8 +1587,8 @@ static int vop_bind(struct device *dev, struct device *master, void *data) ...@@ -1587,8 +1587,8 @@ static int vop_bind(struct device *dev, struct device *master, void *data)
return -ENODEV; return -ENODEV;
/* Allocate vop struct and its vop_win array */ /* Allocate vop struct and its vop_win array */
alloc_size = sizeof(*vop) + sizeof(*vop->win) * vop_data->win_size; vop = devm_kzalloc(dev, struct_size(vop, win, vop_data->win_size),
vop = devm_kzalloc(dev, alloc_size, GFP_KERNEL); GFP_KERNEL);
if (!vop) if (!vop)
return -ENOMEM; return -ENOMEM;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment