From patchwork Thu Jun 7 02:00:33 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Stewart X-Patchwork-Id: 170945 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from maxx.maxx.shmoo.com (maxx.shmoo.com [205.134.188.171]) by ozlabs.org (Postfix) with ESMTP id 8B4B42C02C9 for ; Sat, 14 Jul 2012 04:33:29 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id F25389D245; Fri, 13 Jul 2012 14:33:26 -0400 (EDT) X-Virus-Scanned: amavisd-new at maxx.shmoo.com Received: from maxx.maxx.shmoo.com ([127.0.0.1]) by localhost (maxx.shmoo.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id vlkHwRCt6JY4; Fri, 13 Jul 2012 14:33:26 -0400 (EDT) Received: from maxx.shmoo.com (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id 812379D23F; Fri, 13 Jul 2012 14:33:21 -0400 (EDT) X-Original-To: mailman-post+hostap@maxx.shmoo.com Delivered-To: mailman-post+hostap@maxx.shmoo.com Received: from localhost (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id B13259D23F for ; Fri, 13 Jul 2012 14:33:20 -0400 (EDT) X-Virus-Scanned: amavisd-new at maxx.shmoo.com Received: from maxx.maxx.shmoo.com ([127.0.0.1]) by localhost (maxx.shmoo.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id y5ifVhYKWCGk for ; Fri, 13 Jul 2012 14:33:17 -0400 (EDT) Received: from mail-lb0-f202.google.com (mail-lb0-f202.google.com [209.85.217.202]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority" (not verified)) by maxx.maxx.shmoo.com (Postfix) with ESMTPS id DF0D89C19A for ; Fri, 13 Jul 2012 14:33:16 -0400 (EDT) Received: by lbbgp10 with SMTP id gp10so229779lbb.5 for ; Fri, 13 Jul 2012 11:33:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=in-reply-to:references:from:date:subject:to:cc:message-id :x-gm-message-state; bh=nhoWIJxsqxsymZik8klgic4ym7tRJMv8XdGhQ1n9YnE=; b=PNR1ALUmAJVlzt3MEkvuknhESDS7Kk0WepbXxWm4AUE7N9Wd1MTiaTCRELfD1SMUoD eAKAqz/NDnsLeIvO25/S7fSv8273bEZic6WxlDd1ZQCw3LbrS7Gj3OfaJIP3oiLP5PY3 99YJB2VgBhb7H4eTi5uFnkmtKx2w07nZMLtCJmPAuaADR94nCJ3JjkLNSoyxLWxOOyn0 mUyLxreQwYAUngW1kJ5BqTK3UpWU+dMdjXCRKR7jUFcGsZhKggMXr1TdlzmHnOn7zEZ4 svo5px7o0MWXh6lYb8VkAajVuyPDuORE9+tIspKQ33FPdg2PWnvHWLtjOAgWF+sshIn7 KS6Q== Received: by 10.14.47.141 with SMTP id t13mr1088691eeb.10.1342204395088; Fri, 13 Jul 2012 11:33:15 -0700 (PDT) Received: by 10.14.47.141 with SMTP id t13mr1088682eeb.10.1342204394979; Fri, 13 Jul 2012 11:33:14 -0700 (PDT) Received: from hpza9.eem.corp.google.com ([74.125.121.33]) by gmr-mx.google.com with ESMTPS id b15si5674891een.0.2012.07.13.11.33.14 (version=TLSv1/SSLv3 cipher=AES128-SHA); Fri, 13 Jul 2012 11:33:14 -0700 (PDT) Received: from glenhelen.mtv.corp.google.com (glenhelen.mtv.corp.google.com [172.22.72.223]) by hpza9.eem.corp.google.com (Postfix) with ESMTP id C3F915C0050; Fri, 13 Jul 2012 11:33:14 -0700 (PDT) Received: by glenhelen.mtv.corp.google.com (Postfix, from userid 110058) id 1C7B8205FD; Fri, 13 Jul 2012 11:33:14 -0700 (PDT) In-Reply-To: <20120608172336.GC10802@w1.fi> References: <20120608172336.GC10802@w1.fi> From: Paul Stewart Date: Wed, 6 Jun 2012 19:00:33 -0700 Subject: [PATCHv3] Fix a couple memory leaks To: hostap@lists.shmoo.com Message-Id: <20120713183314.1C7B8205FD@glenhelen.mtv.corp.google.com> X-Gm-Message-State: ALoCoQmsbhpVKNGkxrATgV6CdSSFRNaPC1+RZtoDcX76tEAkLDrlqa/gJCUUEtwcBt33ASsXo56Jv8yqvhgYV2V6JSy8XRdQ7kuoJPRSpMgnkQrd+8AHu2xH76HcB0Fj1Fut2cWsnTjD1lKn+BP+Zw65gWHgPiiEda08NmPSkGWKPVA/GUlZDIYeyCqFH9wr5UWyuMdrc3tf0W983nZ69HCcdNtHOMFLug== Cc: j@w1.fi X-BeenThere: hostap@lists.shmoo.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: HostAP Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: hostap-bounces@lists.shmoo.com Errors-To: hostap-bounces@lists.shmoo.com Found using valgrind. Signed-hostap: Paul Stewart --- Whups. I already sent a v2. Should have named this v3. src/drivers/driver_nl80211.c | 5 ++++- wpa_supplicant/dbus/dbus_new_handlers.c | 1 + 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c index 0373f43..75cd669 100644 --- a/src/drivers/driver_nl80211.c +++ b/src/drivers/driver_nl80211.c @@ -8444,12 +8444,15 @@ static int nl80211_signal_monitor(void *priv, int threshold, int hysteresis) cqm = nlmsg_alloc(); if (cqm == NULL) - return -1; + goto nla_put_failure; NLA_PUT_U32(cqm, NL80211_ATTR_CQM_RSSI_THOLD, threshold); NLA_PUT_U32(cqm, NL80211_ATTR_CQM_RSSI_HYST, hysteresis); nla_put_nested(msg, NL80211_ATTR_CQM, cqm); + nlmsg_free(cqm); + cqm = NULL; + if (send_and_recv_msgs(drv, msg, NULL, NULL) == 0) return 0; msg = NULL; diff --git a/wpa_supplicant/dbus/dbus_new_handlers.c b/wpa_supplicant/dbus/dbus_new_handlers.c index 8145a70..3f895cf 100644 --- a/wpa_supplicant/dbus/dbus_new_handlers.c +++ b/wpa_supplicant/dbus/dbus_new_handlers.c @@ -609,6 +609,7 @@ DBusMessage * wpas_dbus_handler_create_interface(DBusMessage *message, out: os_free(driver); os_free(ifname); + os_free(confname); os_free(bridge_ifname); return reply;