fs: Set file_handle::handle_bytes before referencing file_handle::f_handle
Subsystems (4)
PATCH 1/1 fs: Set file_handle::handle_bytes before referencing file_handle::f_handle
With adding __counted_by(handle_bytes) to struct file_handle, we need to explicitly set it in the one place it wasn't yet happening prior to accessing the flex array "f_handle".
---
Cc: Christian Brauner <[email protected]>
Cc: "Gustavo A. R. Silva" <[email protected]>
Cc: Alexander Viro <[email protected]>
Cc: Jan Kara <[email protected]>
Cc: Chuck Lever <[email protected]>
Cc: Jeff Layton <[email protected]>
Cc: Amir Goldstein <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
--- fs/fhandle.c | 1 + 1 file changed, 1 insertion(+)
fs/fhandle.c +1 -0
@@ -40,6 +40,7 @@ static long do_sys_name_to_handle(const struct path *path, GFP_KERNEL);if (!handle)return -ENOMEM ; + handle->handle_bytes = f_handle.handle_bytes;/* convert handle size to multiple of sizeof(u32) */ handle_dwords = f_handle.handle_bytes >>2 ;
Signature · 1 line
2.34.1
Quoted 3 lines · Kees Cook
With adding
__counted_by(handle_bytes)to structfile_handle, we need to explicitly set it in the one place it wasn't yet happening prior to accessing the flex array "f_handle".
Yes, which (access to f_handle) happens here:
48 retval = exportfs_encode_fh(path->dentry,
49 (struct fid *)handle->f_handle,
50 &handle_dwords, fh_flags);
Quoted 3 lines
Fixes 1b43c4629756 ("fs: Annotate struct file_handle with __counted_by() and use struct_size()")Signed-off-by Kees Cook <[email protected]>
Thanks for catching this!
--
Gustavo
Quoted 27 lines
---
Cc: Christian Brauner <[email protected]>
Cc: "Gustavo A. R. Silva" <[email protected]>
Cc: Alexander Viro <[email protected]>
Cc: Jan Kara <[email protected]>
Cc: Chuck Lever <[email protected]>
Cc: Jeff Layton <[email protected]>
Cc: Amir Goldstein <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]--- fs/fhandle.c | 1 + 1 file changed, 1 insertion(+)fs/fhandle.c +1
-0@@ -40,6 +40,7 @@ static long do_sys_name_to_handle(const struct path *path, GFP_KERNEL);if (!handle)return -ENOMEM ; + handle->handle_bytes = f_handle.handle_bytes;/* convert handle size to multiple of sizeof(u32) */ handle_dwords = f_handle.handle_bytes >>2 ;
Quoted 6 lines · Kees Cook
With adding
__counted_by(handle_bytes)to structfile_handle, we need to explicitly set it in the one place it wasn't yet happening prior to accessing the flex array "f_handle".Fixes 1b43c4629756 ("fs: Annotate struct file_handle with __counted_by() and use struct_size()")Signed-off-by Kees Cook <[email protected]>
OK, so this isn't really a functional bug AFAIU but the compiler will wrongly complain we are accessing handle->f_handle beyond claimed array size (because handle->handle_bytes == 0 at that point). Am I right? If that's the case, please add a short comment explaining this (because it looks odd we set handle->handle_bytes and then reset it a few lines later). With the comment feel free to add:
Honza
Quoted 30 lines
---
Cc: Christian Brauner <[email protected]>
Cc: "Gustavo A. R. Silva" <[email protected]>
Cc: Alexander Viro <[email protected]>
Cc: Jan Kara <[email protected]>
Cc: Chuck Lever <[email protected]>
Cc: Jeff Layton <[email protected]>
Cc: Amir Goldstein <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]--- fs/fhandle.c | 1 + 1 file changed, 1 insertion(+)fs/fhandle.c +1
-0@@ -40,6 +40,7 @@ static long do_sys_name_to_handle(const struct path *path, GFP_KERNEL);if (!handle)return -ENOMEM ; + handle->handle_bytes = f_handle.handle_bytes;/* convert handle size to multiple of sizeof(u32) */ handle_dwords = f_handle.handle_bytes >>2 ;Signature · 1 line
2.34.1
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Chuck Lever
Acked-byQuoted 15 lines · Jan Kara
Quoted 6 lines · Kees Cook
With adding
__counted_by(handle_bytes)to structfile_handle, we need to explicitly set it in the one place it wasn't yet happening prior to accessing the flex array "f_handle".Fixes 1b43c4629756 ("fs: Annotate struct file_handle with __counted_by() and use struct_size()")Signed-off-by Kees Cook <[email protected]>OK, so this isn't really a functional bug AFAIU but the compiler will wrongly complain we are accessing
handle->f_handlebeyond claimed array size (becausehandle->handle_bytes== 0 at that point). Am I right? If that's the case, please add a short comment explaining this (because it looks odd we sethandle->handle_bytesand then reset it a few lines later). With the comment feel free to add:
Quoted 3 lines
Reviewed-by Jan Kara <[email protected]>Honza
I agree, an in-code comment is needed.
Quoted 33 lines
Quoted 30 lines
---
Cc: Christian Brauner <[email protected]>
Cc: "Gustavo A. R. Silva" <[email protected]>
Cc: Alexander Viro <[email protected]>
Cc: Jan Kara <[email protected]>
Cc: Chuck Lever <[email protected]>
Cc: Jeff Layton <[email protected]>
Cc: Amir Goldstein <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]--- fs/fhandle.c | 1 + 1 file changed, 1 insertion(+)fs/fhandle.c +1
-0@@ -40,6 +40,7 @@ static long do_sys_name_to_handle(const struct path *path, GFP_KERNEL);if (!handle)return -ENOMEM ; + handle->handle_bytes = f_handle.handle_bytes;/* convert handle size to multiple of sizeof(u32) */ handle_dwords = f_handle.handle_bytes >>2 ;Signature · 1 line
2.34.1Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Signature · 1 line
Chuck Lever
Christian Brauner
maintainerQuoted 11 lines · Jan Kara
Quoted 6 lines · Kees Cook
With adding
__counted_by(handle_bytes)to structfile_handle, we need to explicitly set it in the one place it wasn't yet happening prior to accessing the flex array "f_handle".Fixes 1b43c4629756 ("fs: Annotate struct file_handle with __counted_by() and use struct_size()")Signed-off-by Kees Cook <[email protected]>OK, so this isn't really a functional bug AFAIU but the compiler will wrongly complain we are accessing
handle->f_handlebeyond claimed array size (becausehandle->handle_bytes== 0 at that point). Am I right? If
And really, this also needs to please be mentioned in the commit message because from reading the commit message I'm not even sure what this patch is trying to fix.