From: Laurent Vivier <laurent@vivier.eu>
To: "Ilya Leoshkevich" <iii@linux.ibm.com>,
"Alex Bennée" <alex.bennee@linaro.org>
Cc: qemu-devel@nongnu.org,
Christian Borntraeger <borntraeger@linux.ibm.com>,
Richard Henderson <richard.henderson@linaro.org>
Subject: Re: [PATCH v3 1/2] linux-user: Fix unaligned memory access in prlimit64 syscall
Date: Mon, 6 Mar 2023 22:34:11 +0100 [thread overview]
Message-ID: <e78f9e07-96a8-d9ab-c2ad-dd1129101936@vivier.eu> (raw)
In-Reply-To: <20230224003907.263914-2-iii@linux.ibm.com>
Le 24/02/2023 à 01:39, Ilya Leoshkevich a écrit :
> target_rlimit64 contains uint64_t fields, so it's 8-byte aligned on
> some hosts, while some guests may align their respective type on a
> 4-byte boundary. This may lead to an unaligned access, which is an UB.
>
> Fix by defining the fields as abi_ullong. This makes the host alignment
> match that of the guest, and lets the compiler know that it should emit
> code that can deal with the guest alignment.
>
> While at it, also use __get_user() and __put_user() instead of
> tswap64().
>
> Fixes: 163a05a8398b ("linux-user: Implement prlimit64 syscall")
> Reported-by: Richard Henderson <richard.henderson@linaro.org>
> Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
> ---
> linux-user/generic/target_resource.h | 4 ++--
> linux-user/syscall.c | 8 ++++----
> 2 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/linux-user/generic/target_resource.h b/linux-user/generic/target_resource.h
> index 539d8c46772..37d3eb09b3b 100644
> --- a/linux-user/generic/target_resource.h
> +++ b/linux-user/generic/target_resource.h
> @@ -12,8 +12,8 @@ struct target_rlimit {
> };
>
> struct target_rlimit64 {
> - uint64_t rlim_cur;
> - uint64_t rlim_max;
> + abi_ullong rlim_cur;
> + abi_ullong rlim_max;
> };
>
> #define TARGET_RLIM_INFINITY ((abi_ulong)-1)
> diff --git a/linux-user/syscall.c b/linux-user/syscall.c
> index a6c426d73cf..73082531ffc 100644
> --- a/linux-user/syscall.c
> +++ b/linux-user/syscall.c
> @@ -12886,8 +12886,8 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1,
> if (!lock_user_struct(VERIFY_READ, target_rnew, arg3, 1)) {
> return -TARGET_EFAULT;
> }
> - rnew.rlim_cur = tswap64(target_rnew->rlim_cur);
> - rnew.rlim_max = tswap64(target_rnew->rlim_max);
> + __get_user(rnew.rlim_cur, &target_rnew->rlim_cur);
> + __get_user(rnew.rlim_max, &target_rnew->rlim_max);
> unlock_user_struct(target_rnew, arg3, 0);
> rnewp = &rnew;
> }
> @@ -12897,8 +12897,8 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1,
> if (!lock_user_struct(VERIFY_WRITE, target_rold, arg4, 1)) {
> return -TARGET_EFAULT;
> }
> - target_rold->rlim_cur = tswap64(rold.rlim_cur);
> - target_rold->rlim_max = tswap64(rold.rlim_max);
> + __put_user(rold.rlim_cur, &target_rold->rlim_cur);
> + __put_user(rold.rlim_max, &target_rold->rlim_max);
> unlock_user_struct(target_rold, arg4, 1);
> }
> return ret;
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
next prev parent reply other threads:[~2023-03-06 21:34 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-24 0:39 [PATCH v3 0/2] linux-user: Fix unaligned memory access in prlimit64 syscall Ilya Leoshkevich
2023-02-24 0:39 ` [PATCH v3 1/2] " Ilya Leoshkevich
2023-02-24 7:42 ` Philippe Mathieu-Daudé
2023-03-06 21:34 ` Laurent Vivier [this message]
2023-03-07 10:32 ` Laurent Vivier
2023-02-24 0:39 ` [PATCH v3 2/2] tests/tcg/linux-test: Add linux-fork-trap test Ilya Leoshkevich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=e78f9e07-96a8-d9ab-c2ad-dd1129101936@vivier.eu \
--to=laurent@vivier.eu \
--cc=alex.bennee@linaro.org \
--cc=borntraeger@linux.ibm.com \
--cc=iii@linux.ibm.com \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).