* [PATCH][next][V2] io_uring: Fix incorrect sizeof operator for copy_from_user call
@ 2021-06-15 13:00 Colin King
2021-06-15 13:35 ` Pavel Begunkov
2021-06-15 21:37 ` Jens Axboe
0 siblings, 2 replies; 3+ messages in thread
From: Colin King @ 2021-06-15 13:00 UTC (permalink / raw)
To: Jens Axboe, Pavel Begunkov, io-uring; +Cc: kernel-janitors, linux-kernel
From: Colin Ian King <[email protected]>
Static analysis is warning that the sizeof being used is should be
of *data->tags[i] and not data->tags[i]. Although these are the same
size on 64 bit systems it is not a portable assumption to assume
this is true for all cases. Fix this by using a temporary pointer
tag_slot to make the code a clearer.
Addresses-Coverity: ("Sizeof not portable")
Fixes: d878c81610e1 ("io_uring: hide rsrc tag copy into generic helpers")
Signed-off-by: Colin Ian King <[email protected]>
---
V2: Use temp variable tag_slot, this makes code clearer as suggested by
Pavel Begunkov.
---
fs/io_uring.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/fs/io_uring.c b/fs/io_uring.c
index d665c9419ad3..7538d0878ff5 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -7230,8 +7230,10 @@ static int io_rsrc_data_alloc(struct io_ring_ctx *ctx, rsrc_put_fn *do_put,
if (utags) {
ret = -EFAULT;
for (i = 0; i < nr; i++) {
- if (copy_from_user(io_get_tag_slot(data, i), &utags[i],
- sizeof(data->tags[i])))
+ u64 *tag_slot = io_get_tag_slot(data, i);
+
+ if (copy_from_user(tag_slot, &utags[i],
+ sizeof(*tag_slot)))
goto fail;
}
}
--
2.31.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH][next][V2] io_uring: Fix incorrect sizeof operator for copy_from_user call
2021-06-15 13:00 [PATCH][next][V2] io_uring: Fix incorrect sizeof operator for copy_from_user call Colin King
@ 2021-06-15 13:35 ` Pavel Begunkov
2021-06-15 21:37 ` Jens Axboe
1 sibling, 0 replies; 3+ messages in thread
From: Pavel Begunkov @ 2021-06-15 13:35 UTC (permalink / raw)
To: Colin King, Jens Axboe, io-uring; +Cc: kernel-janitors, linux-kernel
On 6/15/21 2:00 PM, Colin King wrote:
> From: Colin Ian King <[email protected]>
>
> Static analysis is warning that the sizeof being used is should be
> of *data->tags[i] and not data->tags[i]. Although these are the same
> size on 64 bit systems it is not a portable assumption to assume
> this is true for all cases. Fix this by using a temporary pointer
> tag_slot to make the code a clearer.
>
> Addresses-Coverity: ("Sizeof not portable")
> Fixes: d878c81610e1 ("io_uring: hide rsrc tag copy into generic helpers")
> Signed-off-by: Colin Ian King <[email protected]>
Reviewed-by: Pavel Begunkov <[email protected]>
> ---
> V2: Use temp variable tag_slot, this makes code clearer as suggested by
> Pavel Begunkov.
> ---
> fs/io_uring.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/fs/io_uring.c b/fs/io_uring.c
> index d665c9419ad3..7538d0878ff5 100644
> --- a/fs/io_uring.c
> +++ b/fs/io_uring.c
> @@ -7230,8 +7230,10 @@ static int io_rsrc_data_alloc(struct io_ring_ctx *ctx, rsrc_put_fn *do_put,
> if (utags) {
> ret = -EFAULT;
> for (i = 0; i < nr; i++) {
> - if (copy_from_user(io_get_tag_slot(data, i), &utags[i],
> - sizeof(data->tags[i])))
> + u64 *tag_slot = io_get_tag_slot(data, i);
> +
> + if (copy_from_user(tag_slot, &utags[i],
> + sizeof(*tag_slot)))
> goto fail;
> }
> }
>
--
Pavel Begunkov
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH][next][V2] io_uring: Fix incorrect sizeof operator for copy_from_user call
2021-06-15 13:00 [PATCH][next][V2] io_uring: Fix incorrect sizeof operator for copy_from_user call Colin King
2021-06-15 13:35 ` Pavel Begunkov
@ 2021-06-15 21:37 ` Jens Axboe
1 sibling, 0 replies; 3+ messages in thread
From: Jens Axboe @ 2021-06-15 21:37 UTC (permalink / raw)
To: Colin King, Pavel Begunkov, io-uring; +Cc: kernel-janitors, linux-kernel
On 6/15/21 7:00 AM, Colin King wrote:
> From: Colin Ian King <[email protected]>
>
> Static analysis is warning that the sizeof being used is should be
> of *data->tags[i] and not data->tags[i]. Although these are the same
> size on 64 bit systems it is not a portable assumption to assume
> this is true for all cases. Fix this by using a temporary pointer
> tag_slot to make the code a clearer.
Applied, thanks.
--
Jens Axboe
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-06-15 21:37 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-06-15 13:00 [PATCH][next][V2] io_uring: Fix incorrect sizeof operator for copy_from_user call Colin King
2021-06-15 13:35 ` Pavel Begunkov
2021-06-15 21:37 ` Jens Axboe
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox