libnvdimm: Annotate struct nd_region with __counted_by
PATCH 1/1 libnvdimm: Annotate struct nd_region 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 checking 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 nd_region. Additionally, since the element count member must be set before accessing the annotated flexible array member, move its initialization earlier.
[1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
--- drivers/nvdimm/nd.h | 2 +- drivers/nvdimm/region_devs.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/nvdimm/nd.h +1 -1
@@ -422,7 +422,7 @@ struct nd_region {struct nd_interleave_set *nd_set;struct nd_percpu_lane __percpu *lane;int (*flush)(struct nd_region *nd_region,struct bio *bio); -struct nd_mapping mapping[]; + struct nd_mapping mapping[] __counted_by(ndr_mappings); }; static inline bool nsl_validate_nlabel(struct nd_region *nd_region,
drivers/nvdimm/region_devs.c +1 -1
@@ -1028,6 +1028,7 @@ static struct nd_region *nd_region_create(struct nvdimm_bus *nvdimm_bus,if (!nd_region)return NULL ; + nd_region->ndr_mappings = ndr_desc->num_mappings;/* CXL pre-assigns memregion ids before creating nvdimm regions */ if (test_bit (ND_REGION_CXL , &ndr_desc->flags)) { nd_region->id = ndr_desc->memregion;
@@ -1062,7 +1063,6 @@ static struct nd_region *nd_region_create(struct nvdimm_bus *nvdimm_bus,get_device (&nvdimm->dev); } - nd_region->ndr_mappings = ndr_desc->num_mappings; nd_region->provider_data = ndr_desc->provider_data; nd_region->nd_set = ndr_desc->nd_set; nd_region->num_lanes = ndr_desc->num_lanes;
Signature · 1 line
2.34.1
Quoted 10 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 checking viaCONFIG_UBSAN_BOUNDS(for array indexing) andCONFIG_FORTIFY_SOURCE(for strcpy/memcpy-family functions).As found with Coccinelle[1], add
__counted_byfor structnd_region. Additionally, since the element count member must be set before accessing the annotated flexible array member, move its initialization earlier.
Quoted 8 lines
[1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
Cc Dan Williams <[email protected]>Cc Vishal Verma <[email protected]>Cc Dave Jiang <[email protected]>Cc Ira Weiny <[email protected]>Signed-off-by Kees Cook <[email protected]>
Quoted 38 lines
--- drivers/nvdimm/nd.h | 2 +- drivers/nvdimm/region_devs.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)drivers/nvdimm/nd.h +1
-1@@ -422,7 +422,7 @@ struct nd_region {struct nd_interleave_set *nd_set;struct nd_percpu_lane __percpu *lane;int (*flush)(struct nd_region *nd_region,struct bio *bio); -struct nd_mapping mapping[]; + struct nd_mapping mapping[] __counted_by(ndr_mappings); }; static inline bool nsl_validate_nlabel(struct nd_region *nd_region,drivers/nvdimm/region_devs.c +1
-1@@ -1028,6 +1028,7 @@ static struct nd_region *nd_region_create(struct nvdimm_bus *nvdimm_bus,if (!nd_region)return NULL ; + nd_region->ndr_mappings = ndr_desc->num_mappings;/* CXL pre-assigns memregion ids before creating nvdimm regions */ if (test_bit (ND_REGION_CXL , &ndr_desc->flags)) { nd_region->id = ndr_desc->memregion;@@ -1062,7 +1063,6 @@ static struct nd_region *nd_region_create(struct nvdimm_bus *nvdimm_bus,get_device (&nvdimm->dev); } - nd_region->ndr_mappings = ndr_desc->num_mappings; nd_region->provider_data = ndr_desc->provider_data; nd_region->nd_set = ndr_desc->nd_set; nd_region->num_lanes = ndr_desc->num_lanes;
Quoted 24 lines · Kees Cook
Prepare for the coming implementation by GCC and Clang of the
__counted_by
attribute. Flexible array members annotated with__counted_bycan have
their accesses bounds-checked at run-time checking viaCONFIG_UBSAN_BOUNDS
(for array indexing) andCONFIG_FORTIFY_SOURCE(for strcpy/memcpy- family
functions).As found with Coccinelle[1], add
__counted_byfor structnd_region. Additionally, since the element count member must be set before accessing
the annotated flexible array member, move its initialization earlier.[1]
https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocciCc Dan Williams <[email protected]>Cc Vishal Verma <[email protected]>Cc Dave Jiang <[email protected]>Cc Ira Weiny <[email protected]>Signed-off-by Kees Cook <[email protected]>
Quoted 4 lines
---
drivers/nvdimm/nd.h | 2 +-
drivers/nvdimm/region_devs.c | 2 +-2 files changed, 2 insertions(+), 2 deletions(-)
Quoted 38 lines
drivers/nvdimm/nd.h +1
-1@@ -422,7 +422,7 @@ struct nd_region { struct nd_interleave_set *nd_set; struct nd_percpu_lane __percpu *lane; int (*flush)(struct nd_region *nd_region, struct bio *bio); - struct nd_mapping mapping[]; + struct nd_mapping mapping[] __counted_by(ndr_mappings); };
static inline bool nsl_validate_nlabel(structnd_region*nd_region,drivers/nvdimm/region_devs.c +0
-0@@ -1028,6 +1028,7 @@ static struct nd_region *nd_region_create(struct nvdimm_bus *nvdimm_bus,
if (!nd_region)
return NULL;
+ nd_region->ndr_mappings =ndr_desc->num_mappings; /* CXL pre-assigns memregion ids before creating nvdimm regions */
if (test_bit(ND_REGION_CXL, &ndr_desc->flags)) {nd_region->id=ndr_desc->memregion;drivers/nvdimm/region_devs.c +0
-0@@ -1062,7 +1063,6 @@ static struct nd_region *nd_region_create(struct nvdimm_bus *nvdimm_bus,
get_device(&nvdimm->dev);
}
- nd_region->ndr_mappings =ndr_desc->num_mappings;nd_region->provider_data=ndr_desc->provider_data;nd_region->nd_set=ndr_desc->nd_set;nd_region->num_lanes=ndr_desc->num_lanes;
Quoted 10 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 checking viaCONFIG_UBSAN_BOUNDS(for array indexing) andCONFIG_FORTIFY_SOURCE(for strcpy/memcpy-family functions).As found with Coccinelle[1], add
__counted_byfor structnd_region. Additionally, since the element count member must be set before accessing the annotated flexible array member, move its initialization earlier.
Quoted 8 lines
[1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
Cc Dan Williams <[email protected]>Cc Vishal Verma <[email protected]>Cc Dave Jiang <[email protected]>Cc Ira Weiny <[email protected]>Signed-off-by Kees Cook <[email protected]>
Thanks
--
Gustavo
Quoted 42 lines
--- drivers/nvdimm/nd.h | 2 +- drivers/nvdimm/region_devs.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)drivers/nvdimm/nd.h +1
-1@@ -422,7 +422,7 @@ struct nd_region {struct nd_interleave_set *nd_set;struct nd_percpu_lane __percpu *lane;int (*flush)(struct nd_region *nd_region,struct bio *bio); -struct nd_mapping mapping[]; + struct nd_mapping mapping[] __counted_by(ndr_mappings); }; static inline bool nsl_validate_nlabel(struct nd_region *nd_region,drivers/nvdimm/region_devs.c +1
-1@@ -1028,6 +1028,7 @@ static struct nd_region *nd_region_create(struct nvdimm_bus *nvdimm_bus,if (!nd_region)return NULL ; + nd_region->ndr_mappings = ndr_desc->num_mappings;/* CXL pre-assigns memregion ids before creating nvdimm regions */ if (test_bit (ND_REGION_CXL , &ndr_desc->flags)) { nd_region->id = ndr_desc->memregion;@@ -1062,7 +1063,6 @@ static struct nd_region *nd_region_create(struct nvdimm_bus *nvdimm_bus,get_device (&nvdimm->dev); } - nd_region->ndr_mappings = ndr_desc->num_mappings; nd_region->provider_data = ndr_desc->provider_data; nd_region->nd_set = ndr_desc->nd_set; nd_region->num_lanes = ndr_desc->num_lanes;Signature · 1 line
2.34.1