Skip to content

Commit 9e13ec6

Browse files
GustavoARSilvajoergroedel
authored andcommitted
iommu/virtio: Add __counted_by for struct viommu_request and use struct_size()
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). While there, use struct_size() helper, instead of the open-coded version, to calculate the size for the allocation of the whole flexible structure, including of course, the flexible-array member. This code was found with the help of Coccinelle, and audited and fixed manually. Signed-off-by: Gustavo A. R. Silva <[email protected]> Reviewed-by: Jean-Philippe Brucker <[email protected]> Reviewed-by: Justin Stitt <[email protected]> Link: https://lore.kernel.org/r/ZSRFW0yDlDo8+at3@work Signed-off-by: Joerg Roedel <[email protected]>
1 parent 6465e26 commit 9e13ec6

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/iommu/virtio-iommu.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ struct viommu_request {
8585
void *writeback;
8686
unsigned int write_offset;
8787
unsigned int len;
88-
char buf[];
88+
char buf[] __counted_by(len);
8989
};
9090

9191
#define VIOMMU_FAULT_RESV_MASK 0xffffff00
@@ -230,7 +230,7 @@ static int __viommu_add_req(struct viommu_dev *viommu, void *buf, size_t len,
230230
if (write_offset <= 0)
231231
return -EINVAL;
232232

233-
req = kzalloc(sizeof(*req) + len, GFP_ATOMIC);
233+
req = kzalloc(struct_size(req, buf, len), GFP_ATOMIC);
234234
if (!req)
235235
return -ENOMEM;
236236

0 commit comments

Comments
 (0)