]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
ath6kl: wmi: use struct_size() helper
authorGustavo A. R. Silva <gustavo@embeddedor.com>
Wed, 3 Apr 2019 18:49:49 +0000 (13:49 -0500)
committerKalle Valo <kvalo@codeaurora.org>
Mon, 29 Apr 2019 14:47:03 +0000 (17:47 +0300)
Make use of the struct_size() helper instead of an open-coded version
in order to avoid any potential type mistakes, in particular in the
context in which this code is being used.

So, replace code of the following form:

sizeof(*ev) + ev->num_neighbors * sizeof(struct wmi_neighbor_info)

with:

struct_size(ev, neighbor, ev->num_neighbors)

This code was detected with the help of Coccinelle.

Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
drivers/net/wireless/ath/ath6kl/wmi.c

index 68854c45d0a455b22445a100ac72ee6277284a25..39925a8f5e85fc34807f1c24de1fed98f39b6bb1 100644 (file)
@@ -1295,8 +1295,7 @@ static int ath6kl_wmi_neighbor_report_event_rx(struct wmi *wmi, u8 *datap,
        if (len < sizeof(*ev))
                return -EINVAL;
        ev = (struct wmi_neighbor_report_event *) datap;
-       if (sizeof(*ev) + ev->num_neighbors * sizeof(struct wmi_neighbor_info)
-           > len) {
+       if (struct_size(ev, neighbor, ev->num_neighbors) > len) {
                ath6kl_dbg(ATH6KL_DBG_WMI,
                           "truncated neighbor event (num=%d len=%d)\n",
                           ev->num_neighbors, len);