Commit ccd3129a authored by Kees Cook's avatar Kees Cook Committed by Keith Busch
Browse files

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. Additionally, since the element count member must
be set before accessing the annotated flexible array member, move its
initialization earlier.

Cc: James Smart <james.smart@broadcom.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Sagi Grimberg <sagi@grimberg.me>
Cc: linux-nvme@lists.infradead.org
Reviewed-by: default avatarGustavo A. R. Silva <gustavoars@kernel.org>
Reviewed-by: default avatarChaitanya Kulkarni <kch@nvidia.com>
Link: https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci

 [1]
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarKeith Busch <kbusch@kernel.org>
parent 5e9b7cfc

drivers/nvme/target/fc.c

+2 −1
Original line number Diff line number Diff line
@@ -146,7 +146,8 @@ 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 */

	/* array of fcp_iods */

	struct nvmet_fc_fcp_iod		fod[] __counted_by(sqsize);

} __aligned(sizeof(unsigned long long));



struct nvmet_fc_hostport {