From patchwork Fri Jan 23 09:36:16 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chen Gang X-Patchwork-Id: 432112 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 C96C11402D7 for ; Fri, 23 Jan 2015 20:44:41 +1100 (AEDT) Received: from localhost ([::1]:57860 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YEan9-0001Tp-I4 for incoming@patchwork.ozlabs.org; Fri, 23 Jan 2015 04:44:39 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33329) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YEams-00018g-3N for qemu-devel@nongnu.org; Fri, 23 Jan 2015 04:44:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YEamo-0003uX-Ti for qemu-devel@nongnu.org; Fri, 23 Jan 2015 04:44:22 -0500 Received: from mail113-248.mail.alibaba.com ([205.204.113.248]:53039 helo=us-alimail-mta1.hst.scl.en.alidc.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YEamo-0003pi-Ip; Fri, 23 Jan 2015 04:44:18 -0500 X-Alimail-AntiSpam: AC=CONTINUE; BC=0.3186151|-1; FP=0|0|0|0|0|-1|-1|-1; HT=r41f05022; 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.147.38.220); Fri, 23 Jan 2015 17:28:37 +0800 Message-ID: <54C21610.7090808@sunrus.com.cn> Date: Fri, 23 Jan 2015 17:36:16 +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.4.x-2.6.x [generic] X-Received-From: 205.204.113.248 Cc: QEMU Trivial , qemu-devel Subject: [Qemu-devel] [PATCH] 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. 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 --- linux-user/syscall.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 290fdea..e6a8e49 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(vec[i].iov_len) > 0) { + unlock_user(vec[i].iov_base, base, 0); + } + } unlock_user(target_vec, target_addr, 0); fail2: free(vec);