ceph: Annotate struct ceph_osd_request with __counted_by
PATCH 1/1 ceph: Annotate struct ceph_osd_request 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 ceph_osd_request.
[1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
--- include/linux/ceph/osd_client.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/ceph/osd_client.h +1 -1
@@ -278,7 +278,7 @@ struct ceph_osd_request {int r_attempts;u32 r_map_dne_bound; -struct ceph_osd_req_op r_ops[]; + struct ceph_osd_req_op r_ops[] __counted_by(r_num_ops); };struct ceph_request_redirect {
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 checking viaCONFIG_UBSAN_BOUNDS(for array indexing) andCONFIG_FORTIFY_SOURCE(for strcpy/memcpy-family functions).As found with Coccinelle[1], add
__counted_byfor structceph_osd_request.
Quoted 7 lines
[1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
Cc Ilya Dryomov <[email protected]>Cc Xiubo Li <[email protected]>Cc Jeff Layton <[email protected]>Signed-off-by Kees Cook <[email protected]>
Thanks
Signature · 1 line
Gustavo
Quoted 17 lines
--- include/linux/ceph/osd_client.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)include/linux/ceph/osd_client.h +1
-1@@ -278,7 +278,7 @@ struct ceph_osd_request {int r_attempts;u32 r_map_dne_bound; -struct ceph_osd_req_op r_ops[]; + struct ceph_osd_req_op r_ops[] __counted_by(r_num_ops); };struct ceph_request_redirect {
Quoted 24 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 structceph_osd_request.[1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
Cc Ilya Dryomov <[email protected]>Cc Xiubo Li <[email protected]>Cc Jeff Layton <[email protected]>Signed-off-by Kees Cook <[email protected]>--- include/linux/ceph/osd_client.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)include/linux/ceph/osd_client.h +0
-0
include/linux/ceph/osd_client.h struct ceph_osd_request { · line 284
Quoted 8 lines
include/linux/ceph/osd_client.h +1
-1@@ -278,7 +278,7 @@ struct ceph_osd_request {int r_attempts;u32 r_map_dne_bound; -struct ceph_osd_req_op r_ops[]; + struct ceph_osd_req_op r_ops[] __counted_by(r_num_ops); };struct ceph_request_redirect {
Thanks!
- Xiubo
Kees Cook
AppliedQuoted 9 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 structceph_osd_request.[...]
Applied to for-next/hardening, thanks!
[1/1] ceph: Annotate struct ceph_osd_request with __counted_by
https://git.kernel.org/kees/c/b25373dde858
Take care,
Signature · 1 line
Kees Cook