diff options
| author | Kees Cook <keescook@chromium.org> | 2018-05-08 19:08:53 -0400 |
|---|---|---|
| committer | Kees Cook <keescook@chromium.org> | 2018-06-06 14:15:43 -0400 |
| commit | 0ed2dd03b94b7b7f66e23f25073b5385d0416589 (patch) | |
| tree | 5b46cbc179ffcdaf40715d53b8308f5a937b5c40 /drivers/clk/clk-scmi.c | |
| parent | b4b06db115bbbc10252287ae2d326fb5ecefaf18 (diff) | |
treewide: Use struct_size() for devm_kmalloc() and friends
Replaces open-coded struct size calculations with struct_size() for
devm_*, f2fs_*, and sock_* allocations. Automatically generated (and
manually adjusted) from the following Coccinelle script:
// Direct reference to struct field.
@@
identifier alloc =~ "devm_kmalloc|devm_kzalloc|sock_kmalloc|f2fs_kmalloc|f2fs_kzalloc";
expression HANDLE;
expression GFP;
identifier VAR, ELEMENT;
expression COUNT;
@@
- alloc(HANDLE, sizeof(*VAR) + COUNT * sizeof(*VAR->ELEMENT), GFP)
+ alloc(HANDLE, struct_size(VAR, ELEMENT, COUNT), GFP)
// mr = kzalloc(sizeof(*mr) + m * sizeof(mr->map[0]), GFP_KERNEL);
@@
identifier alloc =~ "devm_kmalloc|devm_kzalloc|sock_kmalloc|f2fs_kmalloc|f2fs_kzalloc";
expression HANDLE;
expression GFP;
identifier VAR, ELEMENT;
expression COUNT;
@@
- alloc(HANDLE, sizeof(*VAR) + COUNT * sizeof(VAR->ELEMENT[0]), GFP)
+ alloc(HANDLE, struct_size(VAR, ELEMENT, COUNT), GFP)
// Same pattern, but can't trivially locate the trailing element name,
// or variable name.
@@
identifier alloc =~ "devm_kmalloc|devm_kzalloc|sock_kmalloc|f2fs_kmalloc|f2fs_kzalloc";
expression HANDLE;
expression GFP;
expression SOMETHING, COUNT, ELEMENT;
@@
- alloc(HANDLE, sizeof(SOMETHING) + COUNT * sizeof(ELEMENT), GFP)
+ alloc(HANDLE, CHECKME_struct_size(&SOMETHING, ELEMENT, COUNT), GFP)
Signed-off-by: Kees Cook <keescook@chromium.org>
Diffstat (limited to 'drivers/clk/clk-scmi.c')
| -rw-r--r-- | drivers/clk/clk-scmi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/clk/clk-scmi.c b/drivers/clk/clk-scmi.c index 488c21376b55..bb2a6f2f5516 100644 --- a/drivers/clk/clk-scmi.c +++ b/drivers/clk/clk-scmi.c | |||
| @@ -137,8 +137,8 @@ static int scmi_clocks_probe(struct scmi_device *sdev) | |||
| 137 | return -EINVAL; | 137 | return -EINVAL; |
| 138 | } | 138 | } |
| 139 | 139 | ||
| 140 | clk_data = devm_kzalloc(dev, sizeof(*clk_data) + | 140 | clk_data = devm_kzalloc(dev, struct_size(clk_data, hws, count), |
| 141 | sizeof(*clk_data->hws) * count, GFP_KERNEL); | 141 | GFP_KERNEL); |
| 142 | if (!clk_data) | 142 | if (!clk_data) |
| 143 | return -ENOMEM; | 143 | return -ENOMEM; |
| 144 | 144 | ||
