mm/memcg: Annotate struct mem_cgroup_threshold_ary with __counted_by
PATCH 1/1 mm/memcg: Annotate struct mem_cgroup_threshold_ary 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 mem_cgroup_threshold_ary.
[1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
--- include/linux/memcontrol.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/memcontrol.h +1 -1
@@ -143,7 +143,7 @@ struct mem_cgroup_threshold_ary {/* Size of entries[] */ unsigned int size;/* Array of thresholds */ -struct mem_cgroup_threshold entries[]; + struct mem_cgroup_threshold entries[] __counted_by(size); };struct mem_cgroup_thresholds {
Signature · 1 line
2.34.1
Quoted 27 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 structmem_cgroup_threshold_ary.[1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
Cc Andrew Morton <[email protected]>Cc Shakeel Butt <[email protected]>Cc Roman Gushchin <[email protected]>Cc Johannes Weiner <[email protected]>Cc Michal Hocko <[email protected]>Cc "Matthew Wilcox (Oracle)" <[email protected]>Signed-off-by Kees Cook <[email protected]>--- include/linux/memcontrol.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)include/linux/memcontrol.h +0
-0
include/linux/memcontrol.h struct mem_cgroup_threshold_ary { · line 146
Quoted 5 lines
include/linux/memcontrol.h +1
-1@@ -143,7 +143,7 @@ struct mem_cgroup_threshold_ary {/* Size of entries[] */ unsigned int size;/* Array of thresholds */ -struct mem_cgroup_threshold entries[]; + struct mem_cgroup_threshold entries[] __counted_by(size);
Does 'size' here have to be a member of the same struct as entries? We have nodeinfo[] in struct mem_cgroup whose size is nr_node_ids which is global. Will __counted_by() work for that?
Quoted 23 lines · Shakeel Butt
Quoted 22 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 structmem_cgroup_threshold_ary.[1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
Cc Andrew Morton <[email protected]>Cc Shakeel Butt <[email protected]>Cc Roman Gushchin <[email protected]>Cc Johannes Weiner <[email protected]>Cc Michal Hocko <[email protected]>Cc "Matthew Wilcox (Oracle)" <[email protected]>Signed-off-by Kees Cook <[email protected]>--- include/linux/memcontrol.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 14 lines
include/linux/memcontrol.h struct mem_cgroup_threshold_ary { · line 146
Quoted 10 lines
include/linux/memcontrol.h +1
-1@@ -143,7 +143,7 @@ struct mem_cgroup_threshold_ary {/* Size of entries[] */ unsigned int size;/* Array of thresholds */ -struct mem_cgroup_threshold entries[]; + struct mem_cgroup_threshold entries[] __counted_by(size);Does 'size' here have to be a member of the same struct as entries? We have nodeinfo[] in struct
mem_cgroupwhose size isnr_node_idswhich is global. Will__counted_by()work for that?
Not presently, no. This may come in future expansions of the feature. We're also hoping to gain expressions for places where a size isn't a native count, like for big endian, or a byte count that includes the entire struct, etc. For now, though, the feature is narrowly scoped just to get the common case landed.
-Kees
Signature · 1 line
Kees Cook
Quoted 11 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 structmem_cgroup_threshold_ary.[1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
Quoted 7 lines
Cc Andrew Morton <[email protected]>Cc Shakeel Butt <[email protected]>Cc Roman Gushchin <[email protected]>Cc Johannes Weiner <[email protected]>Cc Michal Hocko <[email protected]>Cc "Matthew Wilcox (Oracle)" <[email protected]>Signed-off-by Kees Cook <[email protected]>
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 structmem_cgroup_threshold_ary.[1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
Quoted 7 lines
Cc Andrew Morton <[email protected]>Cc Shakeel Butt <[email protected]>Cc Roman Gushchin <[email protected]>Cc Johannes Weiner <[email protected]>Cc Michal Hocko <[email protected]>Cc "Matthew Wilcox (Oracle)" <[email protected]>Signed-off-by Kees Cook <[email protected]>
Thanks!
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 structmem_cgroup_threshold_ary.[1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
Quoted 7 lines
Cc Andrew Morton <[email protected]>Cc Shakeel Butt <[email protected]>Cc Roman Gushchin <[email protected]>Cc Johannes Weiner <[email protected]>Cc Michal Hocko <[email protected]>Cc "Matthew Wilcox (Oracle)" <[email protected]>Signed-off-by Kees Cook <[email protected]>
Thanks
--
Gustavo
Quoted 21 lines
--- include/linux/memcontrol.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)include/linux/memcontrol.h +1
-1@@ -143,7 +143,7 @@ struct mem_cgroup_threshold_ary {/* Size of entries[] */ unsigned int size;/* Array of thresholds */ -struct mem_cgroup_threshold entries[]; + struct mem_cgroup_threshold entries[] __counted_by(size); };struct mem_cgroup_thresholds {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 structmem_cgroup_threshold_ary.[1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
Quoted 7 lines
Cc Andrew Morton <[email protected]>Cc Shakeel Butt <[email protected]>Cc Roman Gushchin <[email protected]>Cc Johannes Weiner <[email protected]>Cc Michal Hocko <[email protected]>Cc "Matthew Wilcox (Oracle)" <[email protected]>Signed-off-by Kees Cook <[email protected]>
Quoted 19 lines
--- include/linux/memcontrol.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)include/linux/memcontrol.h +1
-1@@ -143,7 +143,7 @@ struct mem_cgroup_threshold_ary {/* Size of entries[] */ unsigned int size;/* Array of thresholds */ -struct mem_cgroup_threshold entries[]; + struct mem_cgroup_threshold entries[] __counted_by(size); };struct mem_cgroup_thresholds {Signature · 1 line
2.34.1
Signature · 2 lines
Michal Hocko SUSE Labs