* [Qemu-devel] [PATCH v3 1/2] linux-user: fix settime old value location
@ 2017-01-19 14:23 Pranith Kumar
2017-01-19 14:23 ` [Qemu-devel] [PATCH v3 2/2] linux-user: fix tcg/mmap test Pranith Kumar
2017-01-19 15:05 ` [Qemu-devel] [PATCH v3 1/2] linux-user: fix settime old value location Laurent Vivier
0 siblings, 2 replies; 4+ messages in thread
From: Pranith Kumar @ 2017-01-19 14:23 UTC (permalink / raw)
To: alex.bennee
Cc: qemu-devel, rth, peter.maydell, laurent, Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
old_value is the 4th argument of timer_settime(), not the 2nd.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Pranith Kumar <bobby.prani@gmail.com>
---
linux-user/syscall.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 7b77503f94..a393764a17 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -12024,10 +12024,14 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
timer_t htimer = g_posix_timers[timerid];
struct itimerspec hspec_new = {{0},}, hspec_old = {{0},};
- target_to_host_itimerspec(&hspec_new, arg3);
+ if (arg3 && target_to_host_itimerspec(&hspec_new, arg3)) {
+ goto efault;
+ }
ret = get_errno(
timer_settime(htimer, arg2, &hspec_new, &hspec_old));
- host_to_target_itimerspec(arg2, &hspec_old);
+ if (arg4 && host_to_target_itimerspec(arg4, &hspec_old)) {
+ goto efault;
+ }
}
break;
}
--
2.11.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Qemu-devel] [PATCH v3 2/2] linux-user: fix tcg/mmap test
2017-01-19 14:23 [Qemu-devel] [PATCH v3 1/2] linux-user: fix settime old value location Pranith Kumar
@ 2017-01-19 14:23 ` Pranith Kumar
2017-01-19 15:05 ` [Qemu-devel] [PATCH v3 1/2] linux-user: fix settime old value location Laurent Vivier
1 sibling, 0 replies; 4+ messages in thread
From: Pranith Kumar @ 2017-01-19 14:23 UTC (permalink / raw)
To: alex.bennee
Cc: qemu-devel, rth, peter.maydell, laurent, Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
tests/tcg/mmap test fails with values other than default target page
size. When creating a map beyond EOF, extra anonymous pages are added up
to the target page boundary. Currently, this operation is performed only
when qemu_real_host_page_size < TARGET_PAGE_SIZE, but it should be
performed if the configured page size (qemu -p) is larger than
qemu_real_host_page_size too.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
[pranith: dropped checkpatch changes]
Signed-off-by: Pranith Kumar <bobby.prani@gmail.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Signed-off-by: Pranith Kumar <bobby.prani@gmail.com>
---
linux-user/mmap.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/linux-user/mmap.c b/linux-user/mmap.c
index 61685bf79e..76905cc9fd 100644
--- a/linux-user/mmap.c
+++ b/linux-user/mmap.c
@@ -429,9 +429,9 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int prot,
may need to truncate file maps at EOF and add extra anonymous pages
up to the targets page boundary. */
- if ((qemu_real_host_page_size < TARGET_PAGE_SIZE)
- && !(flags & MAP_ANONYMOUS)) {
- struct stat sb;
+ if ((qemu_real_host_page_size < qemu_host_page_size) &&
+ !(flags & MAP_ANONYMOUS)) {
+ struct stat sb;
if (fstat (fd, &sb) == -1)
goto fail;
--
2.11.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH v3 1/2] linux-user: fix settime old value location
2017-01-19 14:23 [Qemu-devel] [PATCH v3 1/2] linux-user: fix settime old value location Pranith Kumar
2017-01-19 14:23 ` [Qemu-devel] [PATCH v3 2/2] linux-user: fix tcg/mmap test Pranith Kumar
@ 2017-01-19 15:05 ` Laurent Vivier
2017-01-19 15:16 ` Pranith Kumar
1 sibling, 1 reply; 4+ messages in thread
From: Laurent Vivier @ 2017-01-19 15:05 UTC (permalink / raw)
To: Pranith Kumar, alex.bennee
Cc: qemu-devel, rth, peter.maydell, Marc-André Lureau
Le 19/01/2017 à 15:23, Pranith Kumar a écrit :
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> old_value is the 4th argument of timer_settime(), not the 2nd.
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> Signed-off-by: Pranith Kumar <bobby.prani@gmail.com>
> ---
> linux-user/syscall.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/linux-user/syscall.c b/linux-user/syscall.c
> index 7b77503f94..a393764a17 100644
> --- a/linux-user/syscall.c
> +++ b/linux-user/syscall.c
> @@ -12024,10 +12024,14 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
> timer_t htimer = g_posix_timers[timerid];
> struct itimerspec hspec_new = {{0},}, hspec_old = {{0},};
>
> - target_to_host_itimerspec(&hspec_new, arg3);
> + if (arg3 && target_to_host_itimerspec(&hspec_new, arg3)) {
arg3 cannot be NULL, see 8 lines above, you need to only check the
result of target_to_host_itimerspec().
Thanks,
Laurent
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH v3 1/2] linux-user: fix settime old value location
2017-01-19 15:05 ` [Qemu-devel] [PATCH v3 1/2] linux-user: fix settime old value location Laurent Vivier
@ 2017-01-19 15:16 ` Pranith Kumar
0 siblings, 0 replies; 4+ messages in thread
From: Pranith Kumar @ 2017-01-19 15:16 UTC (permalink / raw)
To: Laurent Vivier
Cc: Alex Bennée, qemu-devel, Richard Henderson, Peter Maydell,
Marc-André Lureau
On Thu, Jan 19, 2017 at 10:05 AM, Laurent Vivier <laurent@vivier.eu> wrote:
> Le 19/01/2017 à 15:23, Pranith Kumar a écrit :
>> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>>
>> old_value is the 4th argument of timer_settime(), not the 2nd.
>>
>> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
>> Signed-off-by: Pranith Kumar <bobby.prani@gmail.com>
>> ---
>> linux-user/syscall.c | 8 ++++++--
>> 1 file changed, 6 insertions(+), 2 deletions(-)
>>
>> diff --git a/linux-user/syscall.c b/linux-user/syscall.c
>> index 7b77503f94..a393764a17 100644
>> --- a/linux-user/syscall.c
>> +++ b/linux-user/syscall.c
>> @@ -12024,10 +12024,14 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
>> timer_t htimer = g_posix_timers[timerid];
>> struct itimerspec hspec_new = {{0},}, hspec_old = {{0},};
>>
>> - target_to_host_itimerspec(&hspec_new, arg3);
>> + if (arg3 && target_to_host_itimerspec(&hspec_new, arg3)) {
>
> arg3 cannot be NULL, see 8 lines above, you need to only check the
> result of target_to_host_itimerspec().
>
OK, I updated this and sent a new patch.
Thanks for the review.
--
Pranith
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-01-19 15:17 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-01-19 14:23 [Qemu-devel] [PATCH v3 1/2] linux-user: fix settime old value location Pranith Kumar
2017-01-19 14:23 ` [Qemu-devel] [PATCH v3 2/2] linux-user: fix tcg/mmap test Pranith Kumar
2017-01-19 15:05 ` [Qemu-devel] [PATCH v3 1/2] linux-user: fix settime old value location Laurent Vivier
2017-01-19 15:16 ` Pranith Kumar
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.