crypto: zstd - Annotate struct zstd_ctx with __counted_by
Subsystems (2)
PATCH 1/1 crypto: zstd - Annotate struct zstd_ctx with __counted_by
Add the __counted_by() compiler attribute to the flexible array member 'wksp' to improve access bounds-checking via CONFIG_UBSAN_BOUNDS and CONFIG_FORTIFY_SOURCE.
Use struct_size(), which provides additional compile-time checks for structures with flexible array members (e.g., __must_be_array()), for the allocation size for a new 'zstd_ctx' while we're at it.
--- crypto/zstd.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
crypto/zstd.c +3 -2
@@ -10,6 +10,7 @@#include <linux/mm.h> #include <linux/module.h> #include <linux/net.h> +#include <linux/overflow.h> #include <linux/vmalloc.h> #include <linux/zstd.h> #include <crypto/internal/acompress.h>
@@ -25,7 +26,7 @@ struct zstd_ctx {zstd_dctx *dctx;size_t wksp_size;zstd_parameters params; -u8 wksp[]__aligned(8) ; + u8 wksp[] __aligned(8) __counted_by(wksp_size); };static DEFINE_MUTEX (zstd_stream_lock);
@@ -44,7 +45,7 @@ static void *zstd_alloc_stream(void)if (!wksp_size)return ERR_PTR (-EINVAL ); - ctx =kvmalloc (sizeof (*ctx) + wksp_size,GFP_KERNEL ); + ctx =kvmalloc (struct_size (ctx, wksp, wksp_size),GFP_KERNEL );if (!ctx)return ERR_PTR (-ENOMEM );
Signature · 1 line
2.51.1
Quoted 9 lines · Thorsten Blum
Add the
__counted_by()compiler attribute to the flexible array member 'wksp' to improve access bounds-checking viaCONFIG_UBSAN_BOUNDSandCONFIG_FORTIFY_SOURCE.Use
struct_size(), which provides additional compile-time checks for structures with flexible array members (e.g.,__must_be_array()), for the allocation size for a new 'zstd_ctx' while we're at it.Signed-off-by Thorsten Blum <[email protected]>
As this is crypto/zstd.c there's no need to sync with upstream zstd code so it can go via the crypto tree.
Herbert Xu
maintainerQuoted 4 lines · Thorsten Blum
Add the
__counted_by()compiler attribute to the flexible array member 'wksp' to improve access bounds-checking viaCONFIG_UBSAN_BOUNDSandCONFIG_FORTIFY_SOURCE.
Quoted 8 lines
Use
struct_size(), which provides additional compile-time checks for structures with flexible array members (e.g.,__must_be_array()), for the allocation size for a new 'zstd_ctx' while we're at it.Signed-off-by Thorsten Blum <[email protected]>--- crypto/zstd.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
Patch applied. Thanks.
Signature · 3 lines
Email: Herbert Xu <[email protected]> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt