[Qemu-devel] [PATCH v3 1/2] linux-user: fix settime old value location

[Qemu-devel] [PATCH v3 1/2] linux-user: fix settime old value location

[Pranith Kumar]

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

[Qemu-devel] [PATCH v3 2/2] linux-user: fix tcg/mmap test

[Pranith Kumar]

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

Re: [Qemu-devel] [PATCH v3 1/2] linux-user: fix settime old value location

[Laurent Vivier]

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

Re: [Qemu-devel] [PATCH v3 1/2] linux-user: fix settime old value location

[Pranith Kumar]

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