media: venus: hfi_cmds: Fix packet size calculation
Subsystems (4)
PATCH v3 1/1 media: venus: hfi_cmds: Fix packet size calculation
Now that a one-element array was replaced with a flexible-array member in struct hfi_sys_set_property_pkt, use the struct_size() helper to correctly calculate the packet size.
---
Changes in v3:
- Fix size calculation in call to struct_size().
Changes in v2:
- Include linux/overflow.h for struct_size().
drivers/media/platform/qcom/venus/hfi_cmds.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/media/platform/qcom/venus/hfi_cmds.c +5 -4
@@ -3,6 +3,7 @@* Copyright (c) 2012-2016, The Linux Foundation. All rights reserved. * Copyright (C) 2017 Linaro Ltd. */ +#include <linux/overflow.h> #include <linux/errno.h> #include <linux/hash.h>
@@ -27,7 +28,7 @@ void pkt_sys_idle_indicator(struct hfi_sys_set_property_pkt *pkt, u32 enable) {struct hfi_enable *hfi = (struct hfi_enable *)&pkt->data[1 ]; - pkt->hdr.size =sizeof (*pkt) +sizeof (*hfi) +sizeof (u32); + pkt->hdr.size =struct_size (pkt, data,1 ) +sizeof (*hfi); pkt->hdr.pkt_type =HFI_CMD_SYS_SET_PROPERTY ; pkt->num_properties =1 ; pkt->data[0 ] =HFI_PROPERTY_SYS_IDLE_INDICATOR ;
@@ -39,7 +40,7 @@ void pkt_sys_debug_config(struct hfi_sys_set_property_pkt *pkt, u32 mode, {struct hfi_debug_config *hfi; - pkt->hdr.size =sizeof (*pkt) +sizeof (*hfi) +sizeof (u32); + pkt->hdr.size =struct_size (pkt, data,1 ) +sizeof (*hfi); pkt->hdr.pkt_type =HFI_CMD_SYS_SET_PROPERTY ; pkt->num_properties =1 ; pkt->data[0 ] =HFI_PROPERTY_SYS_DEBUG_CONFIG ;
@@ -50,7 +51,7 @@ void pkt_sys_debug_config(struct hfi_sys_set_property_pkt *pkt, u32 mode,void pkt_sys_coverage_config (struct hfi_sys_set_property_pkt *pkt,u32 mode) { - pkt->hdr.size =sizeof (*pkt) +sizeof (u32); + pkt->hdr.size =struct_size (pkt, data,2 ); pkt->hdr.pkt_type =HFI_CMD_SYS_SET_PROPERTY ; pkt->num_properties =1 ; pkt->data[0 ] =HFI_PROPERTY_SYS_CONFIG_COVERAGE ;
@@ -116,7 +117,7 @@ void pkt_sys_power_control(struct hfi_sys_set_property_pkt *pkt, u32 enable) {struct hfi_enable *hfi = (struct hfi_enable *)&pkt->data[1 ]; - pkt->hdr.size =sizeof (*pkt) +sizeof (*hfi) +sizeof (u32); + pkt->hdr.size =struct_size (pkt, data,1 ) +sizeof (*hfi); pkt->hdr.pkt_type =HFI_CMD_SYS_SET_PROPERTY ; pkt->num_properties =1 ; pkt->data[0 ] =HFI_PROPERTY_SYS_CODEC_POWER_PLANE_CTRL ;
Signature · 1 line
2.27.0
Quoted 6 lines · Gustavo A. R. Silva
Now that a one-element array was replaced with a flexible-array member in struct
hfi_sys_set_property_pkt, use thestruct_size()helper to correctly calculate the packet size.Fixes 701e10b3fd9f ("media: venus: hfi_cmds.h: Replace one-element array with flexible-array member")Signed-off-by Gustavo A. R. Silva <[email protected]>
Thanks for the update!
Signature · 1 line
Kees Cook
Hi all,
Friendly ping: who can take this, please?
Thanks
--
Gustavo
Quoted 67 lines · Gustavo A. R. Silva
Now that a one-element array was replaced with a flexible-array member in struct
hfi_sys_set_property_pkt, use thestruct_size()helper to correctly calculate the packet size.Fixes 701e10b3fd9f ("media: venus: hfi_cmds.h: Replace one-element array with flexible-array member")Signed-off-by Gustavo A. R. Silva <[email protected]>---
Changes in v3:
- Fix size calculation in call tostruct_size().Changes in v2:
- Includelinux/overflow.hforstruct_size().drivers/media/platform/qcom/venus/hfi_cmds.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)drivers/media/platform/qcom/venus/hfi_cmds.c +5
-4@@ -3,6 +3,7 @@* Copyright (c) 2012-2016, The Linux Foundation. All rights reserved. * Copyright (C) 2017 Linaro Ltd. */ +#include <linux/overflow.h> #include <linux/errno.h> #include <linux/hash.h> @@ -27,7 +28,7 @@ void pkt_sys_idle_indicator(struct hfi_sys_set_property_pkt *pkt, u32 enable) {struct hfi_enable *hfi = (struct hfi_enable *)&pkt->data[1 ]; - pkt->hdr.size =sizeof (*pkt) +sizeof (*hfi) +sizeof (u32); + pkt->hdr.size =struct_size (pkt, data,1 ) +sizeof (*hfi); pkt->hdr.pkt_type =HFI_CMD_SYS_SET_PROPERTY ; pkt->num_properties =1 ; pkt->data[0 ] =HFI_PROPERTY_SYS_IDLE_INDICATOR ;@@ -39,7 +40,7 @@ void pkt_sys_debug_config(struct hfi_sys_set_property_pkt *pkt, u32 mode, {struct hfi_debug_config *hfi; - pkt->hdr.size =sizeof (*pkt) +sizeof (*hfi) +sizeof (u32); + pkt->hdr.size =struct_size (pkt, data,1 ) +sizeof (*hfi); pkt->hdr.pkt_type =HFI_CMD_SYS_SET_PROPERTY ; pkt->num_properties =1 ; pkt->data[0 ] =HFI_PROPERTY_SYS_DEBUG_CONFIG ;@@ -50,7 +51,7 @@ void pkt_sys_debug_config(struct hfi_sys_set_property_pkt *pkt, u32 mode,void pkt_sys_coverage_config (struct hfi_sys_set_property_pkt *pkt,u32 mode) { - pkt->hdr.size =sizeof (*pkt) +sizeof (u32); + pkt->hdr.size =struct_size (pkt, data,2 ); pkt->hdr.pkt_type =HFI_CMD_SYS_SET_PROPERTY ; pkt->num_properties =1 ; pkt->data[0 ] =HFI_PROPERTY_SYS_CONFIG_COVERAGE ;@@ -116,7 +117,7 @@ void pkt_sys_power_control(struct hfi_sys_set_property_pkt *pkt, u32 enable) {struct hfi_enable *hfi = (struct hfi_enable *)&pkt->data[1 ]; - pkt->hdr.size =sizeof (*pkt) +sizeof (*hfi) +sizeof (u32); + pkt->hdr.size =struct_size (pkt, data,1 ) +sizeof (*hfi); pkt->hdr.pkt_type =HFI_CMD_SYS_SET_PROPERTY ; pkt->num_properties =1 ; pkt->data[0 ] =HFI_PROPERTY_SYS_CODEC_POWER_PLANE_CTRL ;