From patchwork Fri Jan 24 16:14:35 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hanjun Guo X-Patchwork-Id: 3535231 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 025699F1C3 for ; Fri, 24 Jan 2014 16:15:12 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BF77620131 for ; Fri, 24 Jan 2014 16:15:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7881020115 for ; Fri, 24 Jan 2014 16:15:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751433AbaAXQPJ (ORCPT ); Fri, 24 Jan 2014 11:15:09 -0500 Received: from mail-pd0-f174.google.com ([209.85.192.174]:60301 "EHLO mail-pd0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751050AbaAXQPI (ORCPT ); Fri, 24 Jan 2014 11:15:08 -0500 Received: by mail-pd0-f174.google.com with SMTP id z10so3307971pdj.33 for ; Fri, 24 Jan 2014 08:15:07 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=sl87uG4buO1o6y5emwtDpFLwVJDGOoLTWCwCdZG3KZg=; b=kohzKoWICn0qe9tPdDZIWhqq11zmHKHBxm26s/Pu1+wQDO30c7sPNE1HnGw2gk+N/l +qlyUVwYrll+QZ/qHsPoGSJwyIq5uEerEYHTjea9838WwKPpEw5azm1haj73cMRhjvCl TcIuYqwM5gQEZUDlWNTszb3M8ktcIxVHwRoYhSPM5sP9uKWsuIbhOTS27YETNM+z/tRp LFaKYm1cmVeF2IBfA1AMsf38IA8D7gllS2gertsEUBJp45Z5hwC0nrZHb5EmD+auv2NW CxpbAr4My2CxPgiyHO+JKPji949gKgA+8K1sJwJEZYJt+H/Rqn+wSTeluwhGGWM5DMtV 9Sjw== X-Gm-Message-State: ALoCoQn+PBmCqpZI2nS01wE9woPKZ86HQXqaTxvXCx2IsyKnHguP+Spd8nosD09V2X4WaHBCdXAm X-Received: by 10.68.130.130 with SMTP id oe2mr15131715pbb.135.1390580107510; Fri, 24 Jan 2014 08:15:07 -0800 (PST) Received: from localhost ([39.181.43.174]) by mx.google.com with ESMTPSA id sy2sm4459589pbc.28.2014.01.24.08.15.04 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 24 Jan 2014 08:15:06 -0800 (PST) From: Hanjun Guo To: Matthew Garrett Cc: "Rafael J. Wysocki" , linux-acpi@vger.kernel.org, patches@linaro.org, linux-kernel@vger.kernel.org, linaro-kernel@lists.linaro.org, linaro-acpi@lists.linaro.org, platform-driver-x86@vger.kernel.org, Hanjun Guo Subject: [PATCH] Platform / wmi: Fix potential memory leak in parse_wdg() Date: Sat, 25 Jan 2014 00:14:35 +0800 Message-Id: <1390580075-14342-1-git-send-email-hanjun.guo@linaro.org> X-Mailer: git-send-email 1.7.9.5 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP we forgot to call wmi_free_devices() and free out.pointer when alloc mamory failed. Signed-off-by: Hanjun Guo --- drivers/platform/x86/wmi.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c index 43d1329..e1338b5 100644 --- a/drivers/platform/x86/wmi.c +++ b/drivers/platform/x86/wmi.c @@ -797,8 +797,11 @@ static int parse_wdg(acpi_handle handle) wmi_dump_wdg(&gblock[i]); wblock = kzalloc(sizeof(struct wmi_block), GFP_KERNEL); - if (!wblock) - return -ENOMEM; + if (!wblock) { + wmi_free_devices(); + retval = -ENOMEM; + goto out_free_pointer; + } wblock->handle = handle; wblock->gblock = gblock[i];