isofs: Annotate struct SL_component with __counted_by()

[PATCH] isofs: Annotate struct SL_component with __counted_by()

Posted by Thorsten Blum 1 year, 3 months ago

Add the __counted_by compiler attribute to the flexible array member
text to improve access bounds-checking via CONFIG_UBSAN_BOUNDS and
CONFIG_FORTIFY_SOURCE.

Signed-off-by: Thorsten Blum <thorsten.blum@toblux.com>
---
 fs/isofs/rock.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/isofs/rock.h b/fs/isofs/rock.h
index ee9660e9671c..7755e587f778 100644
--- a/fs/isofs/rock.h
+++ b/fs/isofs/rock.h
@@ -44,7 +44,7 @@ struct RR_PN_s {
 struct SL_component {
 	__u8 flags;
 	__u8 len;
-	__u8 text[];
+	__u8 text[] __counted_by(len);
 } __attribute__ ((packed));
 
 struct RR_SL_s {
-- 
2.46.0

Re: [PATCH] isofs: Annotate struct SL_component with __counted_by()

Posted by Jan Kara 1 year, 3 months ago

On Fri 30-08-24 18:49:03, Thorsten Blum wrote:
> Add the __counted_by compiler attribute to the flexible array member
> text to improve access bounds-checking via CONFIG_UBSAN_BOUNDS and
> CONFIG_FORTIFY_SOURCE.
> 
> Signed-off-by: Thorsten Blum <thorsten.blum@toblux.com>

Thanks. I've added the patch to my tree.

								Honza

> ---
>  fs/isofs/rock.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/fs/isofs/rock.h b/fs/isofs/rock.h
> index ee9660e9671c..7755e587f778 100644
> --- a/fs/isofs/rock.h
> +++ b/fs/isofs/rock.h
> @@ -44,7 +44,7 @@ struct RR_PN_s {
>  struct SL_component {
>  	__u8 flags;
>  	__u8 len;
> -	__u8 text[];
> +	__u8 text[] __counted_by(len);
>  } __attribute__ ((packed));
>  
>  struct RR_SL_s {
> -- 
> 2.46.0
> 
-- 
Jan Kara <jack@suse.com>
SUSE Labs, CR