media: venus: hfi_cmds: Replace one-element array with flexible-array member
Subsystems (4)
cover media: venus: hfi_cmds: Replace one-element array with flexible-array member
Hi!
This series aims to replace one-element arrays with flexible-array members in struct hfi_session_set_buffers_pkt.
This helps with the ongoing efforts to tighten the FORTIFY_SOURCE routines on memcpy() and help us make progress towards globally enabling -fstrict-flex-arrays=3 [1].
Gustavo A. R. Silva (2):
media: venus: hfi_cmds: Replace one-element array with flexible-array
member
media: venus: hfi_cmds: Use struct_size() helper
drivers/media/platform/qcom/venus/hfi_cmds.c | 16 ++++++++-------- drivers/media/platform/qcom/venus/hfi_cmds.h | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-)
Signature · 1 line
2.34.1
PATCH 1/2 media: venus: hfi_cmds: Replace one-element array with flexible-array member
One-element arrays are deprecated, and we are replacing them with flexible array members instead. So, replace one-element arrays with flexible-array members in struct hfi_session_set_buffers_pkt, and refactor the rest of the code, accordingly.
This helps with the ongoing efforts to tighten the FORTIFY_SOURCE routines on memcpy() and help us make progress towards globally enabling -fstrict-flex-arrays=3 [1].
This results in no differences in binary output.
--- drivers/media/platform/qcom/venus/hfi_cmds.c | 12 ++++++------ drivers/media/platform/qcom/venus/hfi_cmds.h | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-)
drivers/media/platform/qcom/venus/hfi_cmds.c +6 -6
@@ -200,8 +200,8 @@ int pkt_session_set_buffers(struct hfi_session_set_buffers_pkt *pkt,struct hfi_buffer_info *bi; pkt->extradata_size = bd->extradata_size; - pkt->shdr.hdr.size =sizeof (*pkt) -sizeof (u32) + - (bd->num_buffers *sizeof (*bi)); + pkt->shdr.hdr.size =sizeof (*pkt) + + bd->num_buffers *sizeof (*bi); bi = (struct hfi_buffer_info *)pkt->buffer_info;for (i =0 ; i < pkt->num_buffers; i++) { bi->buffer_addr = bd->device_addr;
@@ -210,7 +210,7 @@ int pkt_session_set_buffers(struct hfi_session_set_buffers_pkt *pkt, }else { pkt->extradata_size =0 ; pkt->shdr.hdr.size =sizeof (*pkt) + - ((bd->num_buffers -1 ) *sizeof (u32)); + bd->num_buffers *sizeof (u32);for (i =0 ; i < pkt->num_buffers; i++) pkt->buffer_info[i] = bd->device_addr; }
@@ -243,8 +243,8 @@ int pkt_session_unset_buffers(struct hfi_session_release_buffer_pkt *pkt, bi->extradata_addr = bd->extradata_addr; } pkt->shdr.hdr.size = -sizeof (struct hfi_session_set_buffers_pkt ) - -sizeof (u32) + (bd->num_buffers *sizeof (*bi)); +sizeof (struct hfi_session_set_buffers_pkt ) + + bd->num_buffers *sizeof (*bi); }else {for (i =0 ; i < pkt->num_buffers; i++) pkt->buffer_info[i] = bd->device_addr;
@@ -252,7 +252,7 @@ int pkt_session_unset_buffers(struct hfi_session_release_buffer_pkt *pkt, pkt->extradata_size =0 ; pkt->shdr.hdr.size =sizeof (struct hfi_session_set_buffers_pkt ) + - ((bd->num_buffers -1 ) *sizeof (u32)); + bd->num_buffers *sizeof (u32); } pkt->response_req = bd->response_required;
drivers/media/platform/qcom/venus/hfi_cmds.h +1 -1
@@ -117,7 +117,7 @@ struct hfi_session_set_buffers_pkt {u32 extradata_size;u32 min_buffer_size;u32 num_buffers; -u32 buffer_info[1 ]; +u32 buffer_info[]; };struct hfi_session_get_sequence_header_pkt {
Signature · 1 line
2.34.1
Quoted 9 lines · Gustavo A. R. Silva
One-element arrays are deprecated, and we are replacing them with flexible array members instead. So, replace one-element arrays with flexible-array members in struct
hfi_session_set_buffers_pkt, and refactor the rest of the code, accordingly.This helps with the ongoing efforts to tighten the
FORTIFY_SOURCEroutines onmemcpy()and help us make progress towards globally enabling -fstrict-flex-arrays=3 [1].
Quoted 6 lines
This results in no differences in binary output.
Signature · 1 line
Kees Cook
Quoted 9 lines · Gustavo A. R. Silva
One-element arrays are deprecated, and we are replacing them with flexible array members instead. So, replace one-element arrays with flexible-array members in struct
hfi_session_set_buffers_pkt, and refactor the rest of the code, accordingly.This helps with the ongoing efforts to tighten the
FORTIFY_SOURCEroutines onmemcpy()and help us make progress towards globally enabling -fstrict-flex-arrays=3 [1].
Quoted 6 lines
This results in no differences in binary output.
The patch looks good. As stated in previous patch, lets combine this into a single series.
Quoted 62 lines
--- drivers/media/platform/qcom/venus/hfi_cmds.c | 12 ++++++------ drivers/media/platform/qcom/venus/hfi_cmds.h | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-)drivers/media/platform/qcom/venus/hfi_cmds.c +6
-6@@ -200,8 +200,8 @@ int pkt_session_set_buffers(struct hfi_session_set_buffers_pkt *pkt,struct hfi_buffer_info *bi; pkt->extradata_size = bd->extradata_size; - pkt->shdr.hdr.size =sizeof (*pkt) -sizeof (u32) + - (bd->num_buffers *sizeof (*bi)); + pkt->shdr.hdr.size =sizeof (*pkt) + + bd->num_buffers *sizeof (*bi); bi = (struct hfi_buffer_info *)pkt->buffer_info;for (i =0 ; i < pkt->num_buffers; i++) { bi->buffer_addr = bd->device_addr;@@ -210,7 +210,7 @@ int pkt_session_set_buffers(struct hfi_session_set_buffers_pkt *pkt, }else { pkt->extradata_size =0 ; pkt->shdr.hdr.size =sizeof (*pkt) + - ((bd->num_buffers -1 ) *sizeof (u32)); + bd->num_buffers *sizeof (u32);for (i =0 ; i < pkt->num_buffers; i++) pkt->buffer_info[i] = bd->device_addr; }@@ -243,8 +243,8 @@ int pkt_session_unset_buffers(struct hfi_session_release_buffer_pkt *pkt, bi->extradata_addr = bd->extradata_addr; } pkt->shdr.hdr.size = -sizeof (struct hfi_session_set_buffers_pkt ) - -sizeof (u32) + (bd->num_buffers *sizeof (*bi)); +sizeof (struct hfi_session_set_buffers_pkt ) + + bd->num_buffers *sizeof (*bi); }else {for (i =0 ; i < pkt->num_buffers; i++) pkt->buffer_info[i] = bd->device_addr;@@ -252,7 +252,7 @@ int pkt_session_unset_buffers(struct hfi_session_release_buffer_pkt *pkt, pkt->extradata_size =0 ; pkt->shdr.hdr.size =sizeof (struct hfi_session_set_buffers_pkt ) + - ((bd->num_buffers -1 ) *sizeof (u32)); + bd->num_buffers *sizeof (u32); } pkt->response_req = bd->response_required;drivers/media/platform/qcom/venus/hfi_cmds.h +1
-1@@ -117,7 +117,7 @@ struct hfi_session_set_buffers_pkt {u32 extradata_size;u32 min_buffer_size;u32 num_buffers; -u32 buffer_info[1 ]; +u32 buffer_info[]; };struct hfi_session_get_sequence_header_pkt {
PATCH 2/2 media: venus: hfi_cmds: Use struct_size() helper
In reply to Gustavo A. R. SilvaPrefer struct_size() over open-coded versions of idiom:
sizeof(struct-with-flex-array) + sizeof(typeof-flex-array-elements) * count
where count is the max number of items the flexible array is supposed to contain.
--- drivers/media/platform/qcom/venus/hfi_cmds.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/media/platform/qcom/venus/hfi_cmds.c +4 -4
@@ -209,8 +209,8 @@ int pkt_session_set_buffers(struct hfi_session_set_buffers_pkt *pkt, } }else { pkt->extradata_size =0 ; - pkt->shdr.hdr.size =sizeof (*pkt) + - bd->num_buffers *sizeof (u32); + pkt->shdr.hdr.size =struct_size (pkt, buffer_info, + bd->num_buffers);for (i =0 ; i < pkt->num_buffers; i++) pkt->buffer_info[i] = bd->device_addr; }
@@ -251,8 +251,8 @@ int pkt_session_unset_buffers(struct hfi_session_release_buffer_pkt *pkt, pkt->extradata_size =0 ; pkt->shdr.hdr.size = -sizeof (struct hfi_session_set_buffers_pkt ) + - bd->num_buffers *sizeof (u32); +struct_size ((struct hfi_session_set_buffers_pkt *)0 , + buffer_info, bd->num_buffers); } pkt->response_req = bd->response_required;
Signature · 1 line
2.34.1
Re: [PATCH 2/2][next] media: venus: hfi_cmds: Use struct_size() helper
Quoted 9 lines · Gustavo A. R. Silva
Prefer
struct_size()over open-coded versions of idiom:sizeof(struct-with-flex-array) + sizeof(typeof-flex-array-elements) * count
where count is the max number of items the flexible array is supposed to contain.
Signature · 1 line
Kees Cook
Re: [PATCH 2/2][next] media: venus: hfi_cmds: Use struct_size() helper
In reply to Gustavo A. R. SilvaQuoted 9 lines · Gustavo A. R. Silva
Prefer
struct_size()over open-coded versions of idiom:sizeof(struct-with-flex-array) + sizeof(typeof-flex-array-elements) * count
where count is the max number of items the flexible array is supposed to contain.
The patch looks good. As stated in previous patch, lets combine this into a single series.
Quoted 30 lines
--- drivers/media/platform/qcom/venus/hfi_cmds.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)drivers/media/platform/qcom/venus/hfi_cmds.c +4
-4@@ -209,8 +209,8 @@ int pkt_session_set_buffers(struct hfi_session_set_buffers_pkt *pkt, } }else { pkt->extradata_size =0 ; - pkt->shdr.hdr.size =sizeof (*pkt) + - bd->num_buffers *sizeof (u32); + pkt->shdr.hdr.size =struct_size (pkt, buffer_info, + bd->num_buffers);for (i =0 ; i < pkt->num_buffers; i++) pkt->buffer_info[i] = bd->device_addr; }@@ -251,8 +251,8 @@ int pkt_session_unset_buffers(struct hfi_session_release_buffer_pkt *pkt, pkt->extradata_size =0 ; pkt->shdr.hdr.size = -sizeof (struct hfi_session_set_buffers_pkt ) + - bd->num_buffers *sizeof (u32); +struct_size ((struct hfi_session_set_buffers_pkt *)0 , + buffer_info, bd->num_buffers); } pkt->response_req = bd->response_required;