soc: qcom: apr: Add __counted_by for struct apr_rx_buf and use struct_size()

[sfrench/cifs-2.6.git] / drivers / soc / qcom / apr.c

diff --git a/drivers/soc/qcom/apr.c b/drivers/soc/qcom/apr.c
index 30f81d6d9d9da5c375cc8975f63e38eeea77e7a2..1f8b315576a4abc3f697b03fcf9ecf6d438d4df4 100644 (file)
--- a/drivers/soc/qcom/apr.c
+++ b/drivers/soc/qcom/apr.c
@@ -41,7 +41,7 @@ struct packet_router {
 struct apr_rx_buf {
        struct list_head node;
        int len;
-       uint8_t buf[];
+       uint8_t buf[] __counted_by(len);
 };
 
 /**
@@ -171,7 +171,7 @@ static int apr_callback(struct rpmsg_device *rpdev, void *buf,
                return -EINVAL;
        }
 
-       abuf = kzalloc(sizeof(*abuf) + len, GFP_ATOMIC);
+       abuf = kzalloc(struct_size(abuf, buf, len), GFP_ATOMIC);
        if (!abuf)
                return -ENOMEM;