From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1MOcfR-0006nx-SM
	for qemu-devel@nongnu.org; Wed, 08 Jul 2009 15:18:57 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1MOcfQ-0006lG-E2
	for qemu-devel@nongnu.org; Wed, 08 Jul 2009 15:18:57 -0400
Received: from [199.232.76.173] (port=48893 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1MOcfQ-0006l4-B0
	for qemu-devel@nongnu.org; Wed, 08 Jul 2009 15:18:56 -0400
Received: from naru.obs2.net ([84.20.150.76]:52429)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60)
	(envelope-from <nchip@kos.to>) id 1MOcfP-0006pE-W5
	for qemu-devel@nongnu.org; Wed, 08 Jul 2009 15:18:56 -0400
Date: Wed, 8 Jul 2009 22:18:51 +0300
From: Riku Voipio <riku.voipio@iki.fi>
Message-ID: <20090708191851.GA10993@kos.to>
References: <1246633770-13404-1-git-send-email-uli@suse.de>
	<1246633770-13404-2-git-send-email-uli@suse.de>
	<1246633770-13404-3-git-send-email-uli@suse.de>
	<1246633770-13404-4-git-send-email-uli@suse.de>
	<1246633770-13404-5-git-send-email-uli@suse.de>
	<1246633770-13404-6-git-send-email-uli@suse.de>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1246633770-13404-6-git-send-email-uli@suse.de>
Subject: [Qemu-devel] Re: [PATCH 4/4] getrlimit conversion mix-up
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Ulrich Hecht <uli@suse.de>
Cc: qemu-devel@nongnu.org

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