From patchwork Fri Jan 23 10:01:09 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chen Gang X-Patchwork-Id: 432113 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id EB76B140277 for ; Fri, 23 Jan 2015 20:54:20 +1100 (AEDT) Received: from localhost ([::1]:57896 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YEawR-0005Ka-LV for incoming@patchwork.ozlabs.org; Fri, 23 Jan 2015 04:54:15 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34995) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YEaw5-0004vf-Dt for qemu-devel@nongnu.org; Fri, 23 Jan 2015 04:53:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YEavy-0007Rq-EA for qemu-devel@nongnu.org; Fri, 23 Jan 2015 04:53:53 -0500 Received: from out11.biz.mail.alibaba.com ([205.204.114.131]:42277) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YEavy-0007R7-4E; Fri, 23 Jan 2015 04:53:46 -0500 X-Alimail-AntiSpam: AC=CONTINUE; BC=0.2392635|-1; FP=0|0|0|0|0|-1|-1|-1; HT=r41g03016; MF=gang.chen@sunrus.com.cn; PH=DS; RN=3; RT=3; SR=0; Received: from ShengShiZhuChengdeMacBook-Pro.local(mailfrom:gang.chen@sunrus.com.cn ip:124.127.118.42) by smtp.aliyun-inc.com(10.194.100.38); Fri, 23 Jan 2015 17:53:31 +0800 Message-ID: <54C21BE5.9080100@sunrus.com.cn> Date: Fri, 23 Jan 2015 18:01:09 +0800 From: Chen Gang S User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.10; rv:31.0) Gecko/20100101 Thunderbird/31.4.0 MIME-Version: 1.0 To: riku.voipio@iki.fi X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 205.204.114.131 Cc: QEMU Trivial , qemu-devel Subject: [Qemu-devel] [PATCH v2] linux-user/syscall.c: Free the vec[i] in failure processing code block X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org When failure occurs during allocating vec[i], also need free all allocated vec[i] in failure processing code block before return. In unlock_user(), it will check vec[i].iov_base whether is NULL, so need not check it again outside. If error is EFAULT when "i == 0", vec[i].iov_base is NULL, then can just skip it, so can still use "while (--i >= 0)" for the free looping. Signed-off-by: Chen Gang Reviewed-by: Peter Maydell --- linux-user/syscall.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 290fdea..a66c2ae 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -1873,6 +1873,11 @@ static struct iovec *lock_iovec(int type, abi_ulong target_addr, return vec; fail: + while (--i >= 0) { + if (tswapal(target_vec[i].iov_len) > 0) { + unlock_user(vec[i].iov_base, tswapal(target_vec[i].iov_base), 0); + } + } unlock_user(target_vec, target_addr, 0); fail2: free(vec);