From patchwork Wed Mar 19 14:02:56 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Riku Voipio X-Patchwork-Id: 26582 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f198.google.com (mail-ie0-f198.google.com [209.85.223.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 0242320534 for ; Wed, 19 Mar 2014 14:04:29 +0000 (UTC) Received: by mail-ie0-f198.google.com with SMTP id to1sf30664865ieb.5 for ; Wed, 19 Mar 2014 07:04:29 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:date :message-id:in-reply-to:references:cc:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=nM8UdfXLV3tSZnacj/0ZPtxKYjA2U+OvLYBFGpavL3I=; b=eM6S191avURxgJY8NSy0VKAKDu9UdhNqeB2wfiDKlwuTQQux0cqCN4KpVrfBpqNSIP hIw2h4MpNRQOlvOh6av8EOyaFj5GeEhfzjfONcOeZrhP3iXXpViqU4FHhSaT5pD25Q+f pDPAJnTVDU4v/vpNna7pxCOIc5yoGHodXEszm8DzPSR6CUWEw05hk4psNp34kmIu/EJj hVurlqrUwv/OgiYHVH95IgjJ6TedI8V/prtpfs7YCaMyA0BaSL4I6CLKU0fGcclYFYoP PdyQStE7IS6qAizwCCQT60rw+UpLuOz+JnQ81lXXsQUgNH8Js+HlsgpAgCF0816woeCp k50A== X-Gm-Message-State: ALoCoQkcRppgSYDErnDHEayw7b44ZQm6Kw6ABpUYgCQtfeIFJP18V9k8+9wnDS0zFTHu7e3fkNnr X-Received: by 10.50.176.229 with SMTP id cl5mr10914649igc.3.1395237869474; Wed, 19 Mar 2014 07:04:29 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.89.70 with SMTP id u64ls1797690qgd.80.gmail; Wed, 19 Mar 2014 07:04:29 -0700 (PDT) X-Received: by 10.52.240.207 with SMTP id wc15mr26295237vdc.14.1395237869330; Wed, 19 Mar 2014 07:04:29 -0700 (PDT) Received: from mail-ve0-f179.google.com (mail-ve0-f179.google.com [209.85.128.179]) by mx.google.com with ESMTPS id e11si1619705vco.62.2014.03.19.07.04.29 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 19 Mar 2014 07:04:29 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.179 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.179; Received: by mail-ve0-f179.google.com with SMTP id db12so8775310veb.24 for ; Wed, 19 Mar 2014 07:04:29 -0700 (PDT) X-Received: by 10.58.172.132 with SMTP id bc4mr805vec.45.1395237869227; Wed, 19 Mar 2014 07:04:29 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.78.9 with SMTP id i9csp302283vck; Wed, 19 Mar 2014 07:04:28 -0700 (PDT) X-Received: by 10.194.187.50 with SMTP id fp18mr1671937wjc.89.1395237867038; Wed, 19 Mar 2014 07:04:27 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id my7si10240182wic.69.2014.03.19.07.04.26 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 19 Mar 2014 07:04:27 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Received: from localhost ([::1]:41556 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WQH6X-0000bs-K6 for patch@linaro.org; Wed, 19 Mar 2014 10:04:25 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54603) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WQH5L-0007ki-I2 for qemu-devel@nongnu.org; Wed, 19 Mar 2014 10:03:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WQH5G-000606-ME for qemu-devel@nongnu.org; Wed, 19 Mar 2014 10:03:11 -0400 Received: from afflict.kos.to ([92.243.29.197]:54508) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WQH5G-0005uw-Ef for qemu-devel@nongnu.org; Wed, 19 Mar 2014 10:03:06 -0400 Received: from localhost.localdomain (afflict [92.243.29.197]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by afflict.kos.to (Postfix) with ESMTPSA id 22D6D26564; Wed, 19 Mar 2014 15:03:04 +0100 (CET) From: riku.voipio@linaro.org To: qemu-devel@nongnu.org Date: Wed, 19 Mar 2014 16:02:56 +0200 Message-Id: <7f72cd235fa33f2fc7a8d1cc4d621bf7db61e9eb.1395237255.git.riku.voipio@linaro.org> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 92.243.29.197 Cc: Peter Maydell , Anthony Liguori Subject: [Qemu-devel] [PULL for-2.0 1/7] linux-user/signal.c: Correct error path for AArch64 do_rt_sigreturn 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: riku.voipio@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.179 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 From: Peter Maydell The error path in AArch64 do_rt_sigreturn() which fails before attempting lock_user_struct() was doing an unlock_user_struct() on an uninitialized variable. Initialize frame to NULL so we can use the same error-exit path in all cases (unlock of NULL is permitted and does nothing). Signed-off-by: Peter Maydell Signed-off-by: Riku Voipio --- linux-user/signal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux-user/signal.c b/linux-user/signal.c index 24c91f3..209855e 100644 --- a/linux-user/signal.c +++ b/linux-user/signal.c @@ -1340,7 +1340,7 @@ static void setup_frame(int sig, struct target_sigaction *ka, long do_rt_sigreturn(CPUARMState *env) { - struct target_rt_sigframe *frame; + struct target_rt_sigframe *frame = NULL; abi_ulong frame_addr = env->xregs[31]; if (frame_addr & 15) {