nvmet-fc: Annotate struct nvmet_fc_tgt_queue with __counted_by
Subsystems (3)
PATCH 1/1 nvmet-fc: Annotate struct nvmet_fc_tgt_queue with __counted_by
Prepare for the coming implementation by GCC and Clang of the __counted_by attribute. Flexible array members annotated with __counted_by can have their accesses bounds-checked at run-time via CONFIG_UBSAN_BOUNDS (for array indexing) and CONFIG_FORTIFY_SOURCE (for strcpy/memcpy-family functions).
As found with Coccinelle[1], add __counted_by for struct nvmet_fc_tgt_queue.
--- drivers/nvme/target/fc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/nvme/target/fc.c +1 -1
@@ -146,7 +146,7 @@ struct nvmet_fc_tgt_queue {struct workqueue_struct *work_q;struct kref ref;struct rcu_head rcu; -struct nvmet_fc_fcp_iod fod[];/* array of fcp_iods */ + struct nvmet_fc_fcp_iod fod[] __counted_by(sqsize); /* array of fcp_iods */ }__aligned(sizeof(unsigned long long)) ;struct nvmet_fc_hostport {
Signature · 1 line
2.34.1
Quoted 8 lines · Kees Cook
Prepare for the coming implementation by GCC and Clang of the
__counted_byattribute. Flexible array members annotated with__counted_bycan have their accesses bounds-checked at run-time viaCONFIG_UBSAN_BOUNDS(for array indexing) andCONFIG_FORTIFY_SOURCE(for strcpy/memcpy-family functions).As found with Coccinelle[1], add
__counted_byfor structnvmet_fc_tgt_queue.
Quoted 7 lines
Cc James Smart <[email protected]>Cc Christoph Hellwig <[email protected]>Cc Sagi Grimberg <[email protected]>Cc Chaitanya Kulkarni <[email protected]>Signed-off-by Kees Cook <[email protected]>
Thanks
--
Gustavo
Quoted 17 lines
--- drivers/nvme/target/fc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/nvme/target/fc.c +1
-1@@ -146,7 +146,7 @@ struct nvmet_fc_tgt_queue {struct workqueue_struct *work_q;struct kref ref;struct rcu_head rcu; -struct nvmet_fc_fcp_iod fod[];/* array of fcp_iods */ + struct nvmet_fc_fcp_iod fod[] __counted_by(sqsize); /* array of fcp_iods */ }__aligned(sizeof(unsigned long long)) ;struct nvmet_fc_hostport {
Quoted 8 lines · Kees Cook
Prepare for the coming implementation by GCC and Clang of the
__counted_byattribute. Flexible array members annotated with__counted_bycan have their accesses bounds-checked at run-time viaCONFIG_UBSAN_BOUNDS(for array indexing) andCONFIG_FORTIFY_SOURCE(for strcpy/memcpy-family functions).As found with Coccinelle[1], add
__counted_byfor structnvmet_fc_tgt_queue.
Quoted 9 lines
Cc James Smart <[email protected]>Cc Christoph Hellwig <[email protected]>Cc Sagi Grimberg <[email protected]>Cc Chaitanya Kulkarni <[email protected]>Signed-off-by Kees Cook <[email protected]>---
Looks good.
-ck
Christoph Hellwig
maintainerdrivers/nvme/target/fc.c struct nvmet_fc_tgt_queue { · line 149
Quoted 5 lines · Kees Cook
drivers/nvme/target/fc.c +1
-1struct workqueue_struct *work_q;struct kref ref;struct rcu_head rcu; -struct nvmet_fc_fcp_iod fod[];/* array of fcp_iods */ + struct nvmet_fc_fcp_iod fod[] __counted_by(sqsize); /* array of fcp_iods */
Please move the comment up to not spill over the end of the line.
Otherwise this looks good.