diff options
| author |   Kees Cook <keescook@chromium.org> | 2023-09-15 13:15:10 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2023-09-18 10:39:29 +0100 |
| commit | 1cb6422ecac8804ebe0b71f4b3440674955fec73 (patch) | |
| tree | 902d1dc409b3fb18eab1fff0885f9b6fe0c84731 /include/linux/ceph | |
| parent | net: spider_net: Use size_add() in call to struct_size() (diff) | |
| download | wireguard-linux-1cb6422ecac8804ebe0b71f4b3440674955fec73.tar.xz wireguard-linux-1cb6422ecac8804ebe0b71f4b3440674955fec73.zip | |
ceph: Annotate struct ceph_monmap 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_monmap.
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
Cc: Ilya Dryomov <idryomov@gmail.com>
Cc: Xiubo Li <xiubli@redhat.com>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Eric Dumazet <edumazet@google.com>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: Paolo Abeni <pabeni@redhat.com>
Cc: ceph-devel@vger.kernel.org
Cc: netdev@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Reviewed-by: Xiubo Li <xiubli@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/ceph')
| -rw-r--r-- | include/linux/ceph/mon_client.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/ceph/mon_client.h b/include/linux/ceph/mon_client.h index b658961156a0..7a9a40163c0f 100644 --- a/include/linux/ceph/mon_client.h +++ b/include/linux/ceph/mon_client.h @@ -19,7 +19,7 @@ struct ceph_monmap { struct ceph_fsid fsid; u32 epoch; u32 num_mon; - struct ceph_entity_inst mon_inst[]; + struct ceph_entity_inst mon_inst[] __counted_by(num_mon); }; struct ceph_mon_client; |