From patchwork Thu Jan 17 13:28:43 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cong Ding X-Patchwork-Id: 213262 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 6EF4E2C007B for ; Fri, 18 Jan 2013 00:28:50 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751908Ab3AQN2t (ORCPT ); Thu, 17 Jan 2013 08:28:49 -0500 Received: from mail-qa0-f42.google.com ([209.85.216.42]:49394 "EHLO mail-qa0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753288Ab3AQN2s (ORCPT ); Thu, 17 Jan 2013 08:28:48 -0500 Received: by mail-qa0-f42.google.com with SMTP id hg5so4254547qab.15 for ; Thu, 17 Jan 2013 05:28:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:date:from:to:cc:subject:message-id:references :mime-version:content-type:content-disposition:in-reply-to :user-agent; bh=iojp1by8F30OjdsNOcIWoPfWjcQWhTEYb97h478En98=; b=VIeKQZQhFAiyQRdXiBxnLkEuJFc8k00olHADkcBVR4TNelAsxzLotET9VPBpxc7n2p DxqGIZPBWUzldr1TfcmnfXGgA7/mh6v/QymqZ0wkvvXygSH/vd8Ukve8TO+do5Yhpxjq KuadIau5n9qoR6ChIeokbN3KAMomB+qllCK9QYQdbUhcLuLG49FO4WOjAAwX+gqldQcE JhyXTNncJzGOXawAsu01LbR/zfbGew+NMKhTNSXygN26qyVstKjMNmQmO+OVCwIpK3Ne /CmBsFevLgbHCfTgtxtUgJ7Uh1fKgrOEHy3Txc9DKaSRg6vxLfEnD1XzbtlR3EKgnSVo 92BA== X-Received: by 10.49.59.131 with SMTP id z3mr6237908qeq.1.1358429327805; Thu, 17 Jan 2013 05:28:47 -0800 (PST) Received: from gmail.com (ec2-54-243-39-165.compute-1.amazonaws.com. [54.243.39.165]) by mx.google.com with ESMTPS id ks10sm760661qeb.13.2013.01.17.05.28.44 (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 17 Jan 2013 05:28:45 -0800 (PST) Date: Thu, 17 Jan 2013 13:28:43 +0000 From: Cong Ding To: Richard Mortimer Cc: Sam Ravnborg , "David S. Miller" , sparclinux@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3] sparc: kernel/sbus.c: fix memory leakage Message-ID: <20130117132843.GD25615@gmail.com> References: <1358199372-11976-1-git-send-email-dinggnu@gmail.com> <20130116211309.GA13993@merkur.ravnborg.org> <20130116211725.GC18593@gmail.com> <20130116220018.GA14063@merkur.ravnborg.org> <20130116220153.GD18593@gmail.com> <50F7D577.8010506@oldelvet.org.uk> <20130117115637.GB25615@gmail.com> <50F7EED3.1050309@oldelvet.org.uk> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <50F7EED3.1050309@oldelvet.org.uk> User-Agent: Mutt/1.5.20 (2009-12-10) Sender: sparclinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: sparclinux@vger.kernel.org The variable iommu and strbuf are not freed properly if it goes to error. Signed-off-by: Cong Ding Reviewed-by: Richard Mortimer --- arch/sparc/kernel/sbus.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/sparc/kernel/sbus.c b/arch/sparc/kernel/sbus.c index 1271b3a..be5bdf9 100644 --- a/arch/sparc/kernel/sbus.c +++ b/arch/sparc/kernel/sbus.c @@ -554,10 +554,8 @@ static void __init sbus_iommu_init(struct platform_device *op) regs = pr->phys_addr; iommu = kzalloc(sizeof(*iommu), GFP_ATOMIC); - if (!iommu) - goto fatal_memory_error; strbuf = kzalloc(sizeof(*strbuf), GFP_ATOMIC); - if (!strbuf) + if (!iommu || !strbuf) goto fatal_memory_error; op->dev.archdata.iommu = iommu; @@ -656,6 +654,8 @@ static void __init sbus_iommu_init(struct platform_device *op) return; fatal_memory_error: + kfree(iommu); + kfree(strbuf); prom_printf("sbus_iommu_init: Fatal memory allocation error.\n"); }