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".

Fixes: 1b43c4629756 ("fs: Annotate struct file_handle with __counted_by() and 
use struct_size()")
Signed-off-by: Kees Cook <[email protected]>
---
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(+)

diff --git a/fs/fhandle.c b/fs/fhandle.c
index 53ed54711cd2..08ec2340dd22 100644
--- a/fs/fhandle.c
+++ b/fs/fhandle.c
@@ -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;
-- 
2.34.1


Reply via email to