From: Thorsten Blum <thorsten.blum@toblux.com>
To: clm@fb.com, josef@toxicpanda.com, dsterba@suse.com,
kees@kernel.org, gustavoars@kernel.org
Cc: linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-hardening@vger.kernel.org,
Thorsten Blum <thorsten.blum@toblux.com>
Subject: [PATCH] btrfs: Annotate structs with __counted_by()
Date: Mon, 12 Aug 2024 12:36:20 +0200 [thread overview]
Message-ID: <20240812103619.2720-2-thorsten.blum@toblux.com> (raw)
Add the __counted_by compiler attribute to the flexible array member
stripes to improve access bounds-checking via CONFIG_UBSAN_BOUNDS and
CONFIG_FORTIFY_SOURCE.
Signed-off-by: Thorsten Blum <thorsten.blum@toblux.com>
---
fs/btrfs/volumes.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/fs/btrfs/volumes.h b/fs/btrfs/volumes.h
index 37a09ebb34dd..f28fa318036b 100644
--- a/fs/btrfs/volumes.h
+++ b/fs/btrfs/volumes.h
@@ -551,7 +551,7 @@ struct btrfs_io_context {
* stripes[data_stripes + 1]: The Q stripe (only for RAID6).
*/
u64 full_stripe_logical;
- struct btrfs_io_stripe stripes[];
+ struct btrfs_io_stripe stripes[] __counted_by(num_stripes);
};
struct btrfs_device_info {
@@ -591,7 +591,7 @@ struct btrfs_chunk_map {
int io_width;
int num_stripes;
int sub_stripes;
- struct btrfs_io_stripe stripes[];
+ struct btrfs_io_stripe stripes[] __counted_by(num_stripes);
};
#define btrfs_chunk_map_size(n) (sizeof(struct btrfs_chunk_map) + \
--
2.46.0
next reply other threads:[~2024-08-12 10:37 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-12 10:36 Thorsten Blum [this message]
2024-08-12 10:54 ` Johannes Thumshirn
2024-08-12 12:03 ` Thorsten Blum
2024-08-14 18:02 ` Nathan Chancellor
2024-08-14 19:01 ` Thorsten Blum
2024-08-14 19:26 ` David Sterba
2024-08-12 11:31 ` David Sterba
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240812103619.2720-2-thorsten.blum@toblux.com \
--to=thorsten.blum@toblux.com \
--cc=clm@fb.com \
--cc=dsterba@suse.com \
--cc=gustavoars@kernel.org \
--cc=josef@toxicpanda.com \
--cc=kees@kernel.org \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-hardening@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®