[Qemu-devel] Re: [PATCH 4/4] getrlimit conversion mix-up

[Riku Voipio <riku.voipio@iki.fi>]

Thanks, all patches look fine and have been added to linux-user-for-upstream
que.

On Fri, Jul 03, 2009 at 05:09:30PM +0200, Ulrich Hecht wrote:
> Fixes getrlimit implementation that overwrote the result of the syscall
> instead of converting it
> 
> Signed-off-by: Ulrich Hecht <uli@suse.de>
> ---
>  linux-user/syscall.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/linux-user/syscall.c b/linux-user/syscall.c
> index 498ce49..8e10ea2 100644
> --- a/linux-user/syscall.c
> +++ b/linux-user/syscall.c
> @@ -5021,8 +5021,8 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
>              if (!is_error(ret)) {
>                  if (!lock_user_struct(VERIFY_WRITE, target_rlim, arg2, 0))
>                      goto efault;
> -                rlim.rlim_cur = tswapl(target_rlim->rlim_cur);
> -                rlim.rlim_max = tswapl(target_rlim->rlim_max);
> +                target_rlim->rlim_cur = tswapl(rlim.rlim_cur);
> +                target_rlim->rlim_max = tswapl(rlim.rlim_max);
>                  unlock_user_struct(target_rlim, arg2, 1);
>              }
>          }
> -- 
> 1.6.2.1