* [PATCH] NFSD: Annotate struct pnfs_block_deviceaddr with __counted_by()
@ 2024-08-28 21:42 Thorsten Blum
2024-08-28 22:09 ` Jeff Layton
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Thorsten Blum @ 2024-08-28 21:42 UTC (permalink / raw)
To: chuck.lever, jlayton, neilb, okorniev, Dai.Ngo, tom, kees, gustavoars
Cc: linux-nfs, linux-kernel, linux-hardening, Thorsten Blum
Add the __counted_by compiler attribute to the flexible array member
volumes to improve access bounds-checking via CONFIG_UBSAN_BOUNDS and
CONFIG_FORTIFY_SOURCE.
Use struct_size() instead of manually calculating the number of bytes to
allocate for a pnfs_block_deviceaddr with a single volume.
Signed-off-by: Thorsten Blum <thorsten.blum@toblux.com>
---
fs/nfsd/blocklayout.c | 6 ++----
fs/nfsd/blocklayoutxdr.h | 2 +-
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/fs/nfsd/blocklayout.c b/fs/nfsd/blocklayout.c
index 3c040c81c77d..08a20e5bcf7f 100644
--- a/fs/nfsd/blocklayout.c
+++ b/fs/nfsd/blocklayout.c
@@ -147,8 +147,7 @@ nfsd4_block_get_device_info_simple(struct super_block *sb,
struct pnfs_block_deviceaddr *dev;
struct pnfs_block_volume *b;
- dev = kzalloc(sizeof(struct pnfs_block_deviceaddr) +
- sizeof(struct pnfs_block_volume), GFP_KERNEL);
+ dev = kzalloc(struct_size(dev, volumes, 1), GFP_KERNEL);
if (!dev)
return -ENOMEM;
gdp->gd_device = dev;
@@ -255,8 +254,7 @@ nfsd4_block_get_device_info_scsi(struct super_block *sb,
const struct pr_ops *ops;
int ret;
- dev = kzalloc(sizeof(struct pnfs_block_deviceaddr) +
- sizeof(struct pnfs_block_volume), GFP_KERNEL);
+ dev = kzalloc(struct_size(dev, volumes, 1), GFP_KERNEL);
if (!dev)
return -ENOMEM;
gdp->gd_device = dev;
diff --git a/fs/nfsd/blocklayoutxdr.h b/fs/nfsd/blocklayoutxdr.h
index b0361e8aa9a7..4e28ac8f1127 100644
--- a/fs/nfsd/blocklayoutxdr.h
+++ b/fs/nfsd/blocklayoutxdr.h
@@ -47,7 +47,7 @@ struct pnfs_block_volume {
struct pnfs_block_deviceaddr {
u32 nr_volumes;
- struct pnfs_block_volume volumes[];
+ struct pnfs_block_volume volumes[] __counted_by(nr_volumes);
};
__be32 nfsd4_block_encode_getdeviceinfo(struct xdr_stream *xdr,
--
2.46.0
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] NFSD: Annotate struct pnfs_block_deviceaddr with __counted_by()
2024-08-28 21:42 [PATCH] NFSD: Annotate struct pnfs_block_deviceaddr with __counted_by() Thorsten Blum
@ 2024-08-28 22:09 ` Jeff Layton
2024-08-28 23:58 ` Gustavo A. R. Silva
2024-08-29 14:37 ` Chuck Lever
2 siblings, 0 replies; 4+ messages in thread
From: Jeff Layton @ 2024-08-28 22:09 UTC (permalink / raw)
To: Thorsten Blum, chuck.lever, neilb, okorniev, Dai.Ngo, tom, kees,
gustavoars
Cc: linux-nfs, linux-kernel, linux-hardening
On Wed, 2024-08-28 at 23:42 +0200, Thorsten Blum wrote:
> Add the __counted_by compiler attribute to the flexible array member
> volumes to improve access bounds-checking via CONFIG_UBSAN_BOUNDS and
> CONFIG_FORTIFY_SOURCE.
>
> Use struct_size() instead of manually calculating the number of bytes to
> allocate for a pnfs_block_deviceaddr with a single volume.
>
> Signed-off-by: Thorsten Blum <thorsten.blum@toblux.com>
> ---
> fs/nfsd/blocklayout.c | 6 ++----
> fs/nfsd/blocklayoutxdr.h | 2 +-
> 2 files changed, 3 insertions(+), 5 deletions(-)
>
> diff --git a/fs/nfsd/blocklayout.c b/fs/nfsd/blocklayout.c
> index 3c040c81c77d..08a20e5bcf7f 100644
> --- a/fs/nfsd/blocklayout.c
> +++ b/fs/nfsd/blocklayout.c
> @@ -147,8 +147,7 @@ nfsd4_block_get_device_info_simple(struct super_block *sb,
> struct pnfs_block_deviceaddr *dev;
> struct pnfs_block_volume *b;
>
> - dev = kzalloc(sizeof(struct pnfs_block_deviceaddr) +
> - sizeof(struct pnfs_block_volume), GFP_KERNEL);
> + dev = kzalloc(struct_size(dev, volumes, 1), GFP_KERNEL);
> if (!dev)
> return -ENOMEM;
> gdp->gd_device = dev;
> @@ -255,8 +254,7 @@ nfsd4_block_get_device_info_scsi(struct super_block *sb,
> const struct pr_ops *ops;
> int ret;
>
> - dev = kzalloc(sizeof(struct pnfs_block_deviceaddr) +
> - sizeof(struct pnfs_block_volume), GFP_KERNEL);
> + dev = kzalloc(struct_size(dev, volumes, 1), GFP_KERNEL);
> if (!dev)
> return -ENOMEM;
> gdp->gd_device = dev;
> diff --git a/fs/nfsd/blocklayoutxdr.h b/fs/nfsd/blocklayoutxdr.h
> index b0361e8aa9a7..4e28ac8f1127 100644
> --- a/fs/nfsd/blocklayoutxdr.h
> +++ b/fs/nfsd/blocklayoutxdr.h
> @@ -47,7 +47,7 @@ struct pnfs_block_volume {
>
> struct pnfs_block_deviceaddr {
> u32 nr_volumes;
> - struct pnfs_block_volume volumes[];
> + struct pnfs_block_volume volumes[] __counted_by(nr_volumes);
> };
>
> __be32 nfsd4_block_encode_getdeviceinfo(struct xdr_stream *xdr,
Acked-by: Jeff Layton <jlayton@kernel.org>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] NFSD: Annotate struct pnfs_block_deviceaddr with __counted_by()
2024-08-28 21:42 [PATCH] NFSD: Annotate struct pnfs_block_deviceaddr with __counted_by() Thorsten Blum
2024-08-28 22:09 ` Jeff Layton
@ 2024-08-28 23:58 ` Gustavo A. R. Silva
2024-08-29 14:37 ` Chuck Lever
2 siblings, 0 replies; 4+ messages in thread
From: Gustavo A. R. Silva @ 2024-08-28 23:58 UTC (permalink / raw)
To: Thorsten Blum, chuck.lever, jlayton, neilb, okorniev, Dai.Ngo,
tom, kees, gustavoars
Cc: linux-nfs, linux-kernel, linux-hardening
On 28/08/24 15:42, Thorsten Blum wrote:
> Add the __counted_by compiler attribute to the flexible array member
> volumes to improve access bounds-checking via CONFIG_UBSAN_BOUNDS and
> CONFIG_FORTIFY_SOURCE.
>
> Use struct_size() instead of manually calculating the number of bytes to
> allocate for a pnfs_block_deviceaddr with a single volume.
>
> Signed-off-by: Thorsten Blum <thorsten.blum@toblux.com>
Looks good --`nr_volumes` is updated just before accessing `volumes[]`.
Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Thanks
--
Gustavo
> ---
> fs/nfsd/blocklayout.c | 6 ++----
> fs/nfsd/blocklayoutxdr.h | 2 +-
> 2 files changed, 3 insertions(+), 5 deletions(-)
>
> diff --git a/fs/nfsd/blocklayout.c b/fs/nfsd/blocklayout.c
> index 3c040c81c77d..08a20e5bcf7f 100644
> --- a/fs/nfsd/blocklayout.c
> +++ b/fs/nfsd/blocklayout.c
> @@ -147,8 +147,7 @@ nfsd4_block_get_device_info_simple(struct super_block *sb,
> struct pnfs_block_deviceaddr *dev;
> struct pnfs_block_volume *b;
>
> - dev = kzalloc(sizeof(struct pnfs_block_deviceaddr) +
> - sizeof(struct pnfs_block_volume), GFP_KERNEL);
> + dev = kzalloc(struct_size(dev, volumes, 1), GFP_KERNEL);
> if (!dev)
> return -ENOMEM;
> gdp->gd_device = dev;
> @@ -255,8 +254,7 @@ nfsd4_block_get_device_info_scsi(struct super_block *sb,
> const struct pr_ops *ops;
> int ret;
>
> - dev = kzalloc(sizeof(struct pnfs_block_deviceaddr) +
> - sizeof(struct pnfs_block_volume), GFP_KERNEL);
> + dev = kzalloc(struct_size(dev, volumes, 1), GFP_KERNEL);
> if (!dev)
> return -ENOMEM;
> gdp->gd_device = dev;
> diff --git a/fs/nfsd/blocklayoutxdr.h b/fs/nfsd/blocklayoutxdr.h
> index b0361e8aa9a7..4e28ac8f1127 100644
> --- a/fs/nfsd/blocklayoutxdr.h
> +++ b/fs/nfsd/blocklayoutxdr.h
> @@ -47,7 +47,7 @@ struct pnfs_block_volume {
>
> struct pnfs_block_deviceaddr {
> u32 nr_volumes;
> - struct pnfs_block_volume volumes[];
> + struct pnfs_block_volume volumes[] __counted_by(nr_volumes);
> };
>
> __be32 nfsd4_block_encode_getdeviceinfo(struct xdr_stream *xdr,
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] NFSD: Annotate struct pnfs_block_deviceaddr with __counted_by()
2024-08-28 21:42 [PATCH] NFSD: Annotate struct pnfs_block_deviceaddr with __counted_by() Thorsten Blum
2024-08-28 22:09 ` Jeff Layton
2024-08-28 23:58 ` Gustavo A. R. Silva
@ 2024-08-29 14:37 ` Chuck Lever
2 siblings, 0 replies; 4+ messages in thread
From: Chuck Lever @ 2024-08-29 14:37 UTC (permalink / raw)
To: Thorsten Blum
Cc: jlayton, neilb, okorniev, Dai.Ngo, tom, kees, gustavoars,
linux-nfs, linux-kernel, linux-hardening
On Wed, 28 Aug 2024 23:42:55 +0200, Thorsten Blum wrote:
> Add the __counted_by compiler attribute to the flexible array member
> volumes to improve access bounds-checking via CONFIG_UBSAN_BOUNDS and
> CONFIG_FORTIFY_SOURCE.
>
> Use struct_size() instead of manually calculating the number of bytes to
> allocate for a pnfs_block_deviceaddr with a single volume.
>
> [...]
Applied to nfsd-next for v6.12, thanks!
[1/1] NFSD: Annotate struct pnfs_block_deviceaddr with __counted_by()
commit: 7dd2311b21ef121d0ce9f9b2e56d3e42b2534991
--
Chuck Lever
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-08-29 14:37 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-08-28 21:42 [PATCH] NFSD: Annotate struct pnfs_block_deviceaddr with __counted_by() Thorsten Blum
2024-08-28 22:09 ` Jeff Layton
2024-08-28 23:58 ` Gustavo A. R. Silva
2024-08-29 14:37 ` Chuck Lever
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®