Message ID | 1523608716-5947-2-git-send-email-masashi.honma@gmail.com |
---|---|
State | Changes Requested |
Headers | show
Return-Path: <hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="gBMazYsa"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="irgg5s/1"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40MrmD2Tlvz9s0x for <incoming@patchwork.ozlabs.org>; Fri, 13 Apr 2018 18:39:08 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=3kIvSgdNJkq17nWDUcL3gJfu+6vFzitoJw/b9/g9NbQ=; b=gBMazYsaic8FQnDuRfPrEiM9W2 xJggL9FtzMkIDFh3SZVDuSAhaRPmbxG8GTBy5HL1e/O+C+oOxNtXHRS1K0iNJJd2Ncdhd7lTlW0QM r/AcAmEXS39apEp80IB+4eMydayyoiB/i75a4qSlpyIyltAxNIoV4X6tVZlpNAM9c8KSM/Fq+2MqS TKVe1IzavKSX3AMSomHjwdrrek5+xr7Eo0kAOenx9fZfMIkJANuzBRfuQkiEZe6TMkoln2Kyojbp9 tA5/jRhlrpcRG7cuuzBSlW7+GdyL4Jt4MY5BTssP9ijd5rBytkNq3INVa5JqrZa8nG+O05u5oana5 TMZtrRiQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1f6uEa-0006dc-4q; Fri, 13 Apr 2018 08:39:04 +0000 Received: from mail-pl0-x244.google.com ([2607:f8b0:400e:c01::244]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1f6uEW-0006Zu-65 for hostap@lists.infradead.org; Fri, 13 Apr 2018 08:39:01 +0000 Received: by mail-pl0-x244.google.com with SMTP id 91-v6so5708313pld.3 for <hostap@lists.infradead.org>; Fri, 13 Apr 2018 01:38:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=qnnw8TPdThB1sOApGDpqfy7byEtbals0rjZ77EAgnqU=; b=irgg5s/1pl9jjEl1olMW7J1hTW9LrUXRjtdGok/TJNlEek5r1FUUvdBmxgD3weDcvv 82gelWh7HMEYAP+Q6eTHdZgM/UaT/XF6a+C8DNeZnXx3ne5kbRECIYizuggzjPKI5Kxi 9H4+CAtPy3UNQiQ7nanblmfXV+UFOCi/U0xaMc42WI016S0r2beJKMmPRQk+xjDbQJ8p iTUoekGV7qTnEForM/zil4karEuc4tE6PswpCkeQ1mq+45YJ2vF3jhaodk6fvCJFc0Sn N+FtS9WA+CycCCivzGQu3RwtqWd7OafTr/8sMrGNyLjTSUsKeT9hvv50/w9/ywGRMJzw xFvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=qnnw8TPdThB1sOApGDpqfy7byEtbals0rjZ77EAgnqU=; b=UsQJVyaZllGV+jvOUhPME+xoiZpB2Onw9hoAhosYet0bJgbI00dFOQEjKpwYnSppPI W2+CidHRysKehMR35Wk/rk+RxNI2gBwAqXJcjsd/mCIhsr/QHRbbQyFLTTsk2joVykHj QKVrz1In9KkOdZXcUGKHzIhfnG4XdvqoroHYkcBpNJxDlvkb6++a5IcNo3vlKRyloD3i rIR+rhjaSiVjcInfvJTKmRpWII+2JjjD1mr0wsu2iOSK5zWC+zUdbQ7OFKD5mQceWB7e hmpuEtYp5DL9nu48bQeLX62BIA+p5pOj7uBhIcZ3nwPlsGpWNmxt3UjKyifztD67cxU/ vFVA== X-Gm-Message-State: ALQs6tB30Cjx7xh8RW+Nsp9adezpdayvFxNg7ys0p6DhEFeUHXPwAAFL PrWeB3oaswDWbHr6GAJY796Z7Q== X-Google-Smtp-Source: AIpwx4/SW2hLSCr8PugESSp21nCGScmP5P8pVgbMniUR9YCMO7kzxBiEC1RIInpvu3nxOoSRYgWJUQ== X-Received: by 2002:a17:902:464:: with SMTP id 91-v6mr4348922ple.126.1523608731178; Fri, 13 Apr 2018 01:38:51 -0700 (PDT) Received: from iiyama.flets-east.jp ([2409:11:321:2100:89cb:a57b:2e52:d73]) by smtp.gmail.com with ESMTPSA id v63sm14353199pfk.8.2018.04.13.01.38.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 13 Apr 2018 01:38:50 -0700 (PDT) From: Masashi Honma <masashi.honma@gmail.com> To: hostap@lists.infradead.org Subject: [PATCH 2/3] mesh: Fix a memory leak on error path Date: Fri, 13 Apr 2018 17:38:35 +0900 Message-Id: <1523608716-5947-2-git-send-email-masashi.honma@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1523608716-5947-1-git-send-email-masashi.honma@gmail.com> References: <cover.1523526306.git.peter.oh@bowerswilkins.com> <1523608716-5947-1-git-send-email-masashi.honma@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180413_013900_264041_CC0CADBC X-CRM114-Status: GOOD ( 11.84 ) X-Spam-Score: -0.1 (/) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-0.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2607:f8b0:400e:c01:0:0:0:244 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (masashi.honma[at]gmail.com) -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <hostap.lists.infradead.org> List-Unsubscribe: <http://lists.infradead.org/mailman/options/hostap>, <mailto:hostap-request@lists.infradead.org?subject=unsubscribe> List-Archive: <http://lists.infradead.org/pipermail/hostap/> List-Post: <mailto:hostap@lists.infradead.org> List-Help: <mailto:hostap-request@lists.infradead.org?subject=help> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/hostap>, <mailto:hostap-request@lists.infradead.org?subject=subscribe> Cc: j@w1.fi, Masashi Honma <masashi.honma@gmail.com>, peter.oh@bowerswilkins.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Hostap" <hostap-bounces@lists.infradead.org> Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org |
Series |
[1/3] mesh: Fix some compiler warnings
|
expand
|
diff --git a/wpa_supplicant/mesh.c b/wpa_supplicant/mesh.c index 9450bc4..a5c748a 100644 --- a/wpa_supplicant/mesh.c +++ b/wpa_supplicant/mesh.c @@ -433,8 +433,10 @@ int wpa_supplicant_join_mesh(struct wpa_supplicant *wpa_s, os_zalloc(sizeof(struct wpa_driver_mesh_join_params)); int ret = 0; - if (!ssid || !ssid->ssid || !ssid->ssid_len || !ssid->frequency || !params) { + if (!ssid || !ssid->ssid || !ssid->ssid_len || !ssid->frequency || + !params) { ret = -ENOENT; + os_free(params); goto out; }
1523604178.526129: MEMLEAK[0x28b9ca0]: len 112 1523604178.526939: WPA_TRACE: memleak - START 1523604178.531207: [0]: /home/honma/git/hostap/tests/hwsim/../../wpa_supplicant/wpa_supplicant(os_malloc+0x8e) [0x4535ee] 1523604178.531237: os_malloc() ../src/utils/os_unix.c:702 1523604178.531248: [1]: /home/honma/git/hostap/tests/hwsim/../../wpa_supplicant/wpa_supplicant(os_zalloc+0xe) [0x453b1e] 1523604178.531255: os_zalloc() ../src/utils/os_unix.c:761 1523604178.531911: [2]: /home/honma/git/hostap/tests/hwsim/../../wpa_supplicant/wpa_supplicant(wpa_supplicant_join_mesh+0x2e) [0x45bd8e] 1523604178.531922: wpa_supplicant_join_mesh() mesh.c:436 1523604178.537005: [3]: /home/honma/git/hostap/tests/hwsim/../../wpa_supplicant/wpa_supplicant(wpa_supplicant_associate+0x115) [0x5b9795] 1523604178.537038: wpa_supplicant_associate() wpa_supplicant.c:1913 1523604178.537957: [4]: /home/honma/git/hostap/tests/hwsim/../../wpa_supplicant/wpa_supplicant() [0x5c8eac] 1523604178.537976: wpa_supplicant_scan() scan.c:829 1523604178.538243: [5]: /home/honma/git/hostap/tests/hwsim/../../wpa_supplicant/wpa_supplicant(eloop_run+0x1d4) [0x455964] 1523604178.538255: eloop_run() ../src/utils/eloop.c:1196 1523604178.538291: [6]: /home/honma/git/hostap/tests/hwsim/../../wpa_supplicant/wpa_supplicant(wpa_supplicant_run+0x77) [0x5b5a97] 1523604178.538329: wpa_supplicant_run() wpa_supplicant.c:6175 1523604178.538609: [7]: /home/honma/git/hostap/tests/hwsim/../../wpa_supplicant/wpa_supplicant(main+0x3b0) [0x4404c0] 1523604178.538620: main() main.c:392 1523604178.538624: WPA_TRACE: memleak - END 1523604178.538626: MEMLEAK: total 112 bytes Signed-off-by: Masashi Honma <masashi.honma@gmail.com> --- wpa_supplicant/mesh.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)