From patchwork Fri Apr 13 08:38:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Masashi Honma X-Patchwork-Id: 897885 Return-Path: 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=) 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="J9ie8qnd"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="f8AaDQ+h"; 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 40MrmQ4SBWz9s27 for ; Fri, 13 Apr 2018 18:39:18 +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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version: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=J7CeCGrE2BXnOTOTsnEx4XIjYsGVAHEFeJMnI4F+n8k=; b=J9ie8qndkfgq6L 13Y09ZS3IBPKBQZSONB3AN5f1qoHHrECnaGJnJow3T1QA10IKrHMzsUYsBuzWFgyFfrc8ryIBs4Ze 7hdY1Hj30hUBU5ZeZYfAD9yqxGdpMM/ppEaf5+PBFSTU1NPrpExS15mFfRM7BKVS2lYBYXtA+TLj+ dpAziHVKvv2NNpo26dX7JiLUCqm7Utvh7TG+L0xdsxFg7ZTYVuKlP7m3vfiy6sHCu8Cx1blX1chcN 76gNvRdsTk7j0Mdm7HADMLQTcLSJOqrZXDPcyl3c0FygfaLRWyg1bpIIeXxXx2JeZqJMEQHJBqqjF +q0TznSe60IWkz5cukWw==; 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 1f6uEj-0006iZ-73; Fri, 13 Apr 2018 08:39:13 +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-0006Yo-62 for hostap@lists.infradead.org; Fri, 13 Apr 2018 08:39:03 +0000 Received: by mail-pl0-x244.google.com with SMTP id a39-v6so5700861pla.10 for ; Fri, 13 Apr 2018 01:38:50 -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 :mime-version:content-transfer-encoding; bh=AB3Zmb6CSuxN3zFiq1c+z0GZ5NwNV0vDCSzBXI6P+D4=; b=f8AaDQ+haylU4tpnestty+Mc5oXiTyGYGortCMjiu++Bab53upllopLxBYrPHOINRg kIHfljGKaiI356Fdk4mijbxjt1ciqGLICFCgVPU8oEHHV1/3tJGvK4ucoO4Gqhr5fvv7 zBc8UIT8XUeb+ZAqGtCMrphCJ5ameAC1StZLRMlFYgQCWdvQM2Lv+w/7n4hjaX4vm/BR jc7TcU4cinWrsR1uZ/UnVeTl6NI0I9e14GK3rK+PwVxdrkDpoVFGvDij9NY5wzI+iHIB mWTcEes1wOVW/2j3fO6/TUKgHiCaY5g01gkzcL5C0bqlcTShPkenoei9Nphvu+tO89YL LNKA== 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:mime-version:content-transfer-encoding; bh=AB3Zmb6CSuxN3zFiq1c+z0GZ5NwNV0vDCSzBXI6P+D4=; b=gWmuHgbtJTeqW7Qlbk1PVY/mUy2OxFNOZeuZxFrneBVqnf3gZOFzojs2JrBM2SVyLG cWhyzniiSERVcQ23b1/c9zLKhbExKL4IbgV5HmSlUZgH4O3dso1slUj6m2TCZwDfe5J5 9vvLWQbZB02o69qvI809QcwQ+290RkAqHMw8nydFkNKcDigNp95IN+zCekjQCQhyXtEh 7RsTlJDv3t61/XvTSyviLW+EXDn0pt6ib8GwrUTmvP+PX82TVsA3M5E6IQqtph5G0FFa ttFFRafJagkbVGj6mIkymhx3qIuw1wq7Km8lQ7XUAkts3EscMDrVj7sX5a1YQgJ+qKbV dOzA== X-Gm-Message-State: ALQs6tCKVl46T1QRyhNqlSMsdbo4fy7XT+AraoOxWOiy5V82YoRrtZs/ txXXK8+DVVvHHCTgvpSyRtfzGw== X-Google-Smtp-Source: AIpwx4+4OEedQLgn/+4Lx5+4sRxx7pHtDjvJQDMf30lBTFsRoQ2mO8Jp/pc2FAmgeqN07dQAYCKifQ== X-Received: by 2002:a17:902:be15:: with SMTP id r21-v6mr4272808pls.237.1523608728928; Fri, 13 Apr 2018 01:38:48 -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.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 13 Apr 2018 01:38:48 -0700 (PDT) From: Masashi Honma To: hostap@lists.infradead.org Subject: [PATCH 1/3] mesh: Fix some compiler warnings Date: Fri, 13 Apr 2018 17:38:34 +0900 Message-Id: <1523608716-5947-1-git-send-email-masashi.honma@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180413_013900_280463_F93A7640 X-CRM114-Status: GOOD ( 12.91 ) 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: j@w1.fi, Masashi Honma , peter.oh@bowerswilkins.com Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org mesh.c: In function ‘wpa_supplicant_mesh_init’: mesh.c:203:9: warning: unused variable ‘len’ [-Wunused-variable] size_t len; ^ mesh.c:202:13: warning: unused variable ‘default_groups’ [-Wunused-variable] static int default_groups[] = { 19, 20, 21, 25, 26, -1 }; ^ ap.c: In function ‘wpas_ap_ch_switch’: ap.c:1333:5: warning: suggest explicit braces to avoid ambiguous ‘else’ [-Wparentheses] if (!wpa_s->ap_iface) ^ ap.c: In function ‘wpas_event_dfs_radar_detected’: ap.c:1541:5: warning: suggest explicit braces to avoid ambiguous ‘else’ [-Wparentheses] if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0]) ^ ap.c: In function ‘wpas_event_dfs_cac_started’: ap.c:1559:5: warning: suggest explicit braces to avoid ambiguous ‘else’ [-Wparentheses] if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0]) ^ ap.c: In function ‘wpas_event_dfs_cac_finished’: ap.c:1576:5: warning: suggest explicit braces to avoid ambiguous ‘else’ [-Wparentheses] if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0]) ^ ap.c: In function ‘wpas_event_dfs_cac_aborted’: ap.c:1594:5: warning: suggest explicit braces to avoid ambiguous ‘else’ [-Wparentheses] if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0]) ^ ap.c: In function ‘wpas_event_dfs_cac_nop_finished’: ap.c:1611:5: warning: suggest explicit braces to avoid ambiguous ‘else’ [-Wparentheses] if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0]) ^ Signed-off-by: Masashi Honma --- wpa_supplicant/ap.c | 19 ++++++++++++------- wpa_supplicant/mesh.c | 2 -- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/wpa_supplicant/ap.c b/wpa_supplicant/ap.c index 17b32fb..114848a 100644 --- a/wpa_supplicant/ap.c +++ b/wpa_supplicant/ap.c @@ -1330,11 +1330,12 @@ void wpas_ap_ch_switch(struct wpa_supplicant *wpa_s, int freq, int ht, { struct hostapd_iface *iface = wpa_s->ap_iface; - if (!wpa_s->ap_iface) + if (!wpa_s->ap_iface) { if (!wpa_s->ifmsh) return; else iface = wpa_s->ifmsh; + } wpa_s->assoc_freq = freq; if (wpa_s->current_ssid) @@ -1538,11 +1539,12 @@ void wpas_event_dfs_radar_detected(struct wpa_supplicant *wpa_s, { struct hostapd_iface *iface = wpa_s->ap_iface; - if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0]) + if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0]) { if (!wpa_s->ifmsh || !wpa_s->ifmsh->bss[0]) return; else iface = wpa_s->ifmsh; + } wpa_printf(MSG_DEBUG, "DFS radar detected on %d MHz", radar->freq); hostapd_dfs_radar_detected(iface, radar->freq, radar->ht_enabled, radar->chan_offset, @@ -1556,11 +1558,12 @@ void wpas_event_dfs_cac_started(struct wpa_supplicant *wpa_s, { struct hostapd_iface *iface = wpa_s->ap_iface; - if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0]) + if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0]) { if (!wpa_s->ifmsh || !wpa_s->ifmsh->bss[0]) return; else iface = wpa_s->ifmsh; + } wpa_printf(MSG_DEBUG, "DFS CAC started on %d MHz", radar->freq); hostapd_dfs_start_cac(iface, radar->freq, radar->ht_enabled, radar->chan_offset, @@ -1573,12 +1576,12 @@ void wpas_event_dfs_cac_finished(struct wpa_supplicant *wpa_s, { struct hostapd_iface *iface = wpa_s->ap_iface; - if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0]) + if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0]) { if (!wpa_s->ifmsh || !wpa_s->ifmsh->bss[0]) return; else iface = wpa_s->ifmsh; - + } wpa_printf(MSG_DEBUG, "DFS CAC finished on %d MHz", radar->freq); hostapd_dfs_complete_cac(iface, 1, radar->freq, radar->ht_enabled, radar->chan_offset, @@ -1591,11 +1594,12 @@ void wpas_event_dfs_cac_aborted(struct wpa_supplicant *wpa_s, { struct hostapd_iface *iface = wpa_s->ap_iface; - if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0]) + if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0]) { if (!wpa_s->ifmsh || !wpa_s->ifmsh->bss[0]) return; else iface = wpa_s->ifmsh; + } wpa_printf(MSG_DEBUG, "DFS CAC aborted on %d MHz", radar->freq); hostapd_dfs_complete_cac(iface, 0, radar->freq, radar->ht_enabled, radar->chan_offset, @@ -1608,11 +1612,12 @@ void wpas_event_dfs_cac_nop_finished(struct wpa_supplicant *wpa_s, { struct hostapd_iface *iface = wpa_s->ap_iface; - if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0]) + if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0]) { if (!wpa_s->ifmsh || !wpa_s->ifmsh->bss[0]) return; else iface = wpa_s->ifmsh; + } wpa_printf(MSG_DEBUG, "DFS NOP finished on %d MHz", radar->freq); hostapd_dfs_nop_finished(iface, radar->freq, radar->ht_enabled, radar->chan_offset, diff --git a/wpa_supplicant/mesh.c b/wpa_supplicant/mesh.c index 22dec48..9450bc4 100644 --- a/wpa_supplicant/mesh.c +++ b/wpa_supplicant/mesh.c @@ -199,8 +199,6 @@ static int wpa_supplicant_mesh_init(struct wpa_supplicant *wpa_s, struct hostapd_config *conf; struct mesh_conf *mconf; int basic_rates_erp[] = { 10, 20, 55, 60, 110, 120, 240, -1 }; - static int default_groups[] = { 19, 20, 21, 25, 26, -1 }; - size_t len; int rate_len; int frequency; From patchwork Fri Apr 13 08:38:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masashi Honma X-Patchwork-Id: 897884 Return-Path: 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=) 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 ; 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 ; 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 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: <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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: j@w1.fi, Masashi Honma , peter.oh@bowerswilkins.com MIME-Version: 1.0 Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org 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 --- wpa_supplicant/mesh.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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; } From patchwork Fri Apr 13 08:38:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masashi Honma X-Patchwork-Id: 897886 Return-Path: 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=) 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="GpNwc6Py"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="h99fAam5"; 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 40Mrmg1TDFz9s0x for ; Fri, 13 Apr 2018 18:39:31 +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=Em65hZqV5xL6Wwj7dfsa+PPL7eXzLLRbAE8QArxtCuA=; b=GpNwc6Pyjrkw1/jNWLEBeSGP00 9XwmLdURxo+G1KT0ikb6FlJBGdJYDsLPdmSXOPl2Q40ZJomKITO3uBxWtZvSIR7OHCcKaSDWmUtf5 3TkHOHq0CdXQf98ZFJnRkUMyEFA2hEa+hk3Ut2RkPc3mNqWtygUmoMgrufEagAhH2yaRIgKbmn070 H1OmxzGCOHzLLt6Y4Q2IN7TcNcs61ayfRv3RQwt9kesH5KmiictEgYyqBL/vSiygAqPp2xLM0pnej GwTM/fC91xEw6WWnErTlfKx1uybrhpUi7GOR66ryVtKiqSKbhrnxfoeiOQ8IqgRwNVCjzyA+A3ttY j0H/iwiA==; 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 1f6uEw-0006sc-Gl; Fri, 13 Apr 2018 08:39:26 +0000 Received: from mail-pl0-x241.google.com ([2607:f8b0:400e:c01::241]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1f6uEa-0006b3-5C for hostap@lists.infradead.org; Fri, 13 Apr 2018 08:39:05 +0000 Received: by mail-pl0-x241.google.com with SMTP id t20-v6so5706785ply.9 for ; Fri, 13 Apr 2018 01:38:54 -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=8bs3sq1/e4iSZMQcW3fK8/nzXrhFq9X2q8Ju1Tl73z4=; b=h99fAam5BQXPLPhHzDMSwccdi91y0STQPEUqfY5Cyvv4U2Zks+Vfjsi/W+QGQhhkA3 7asqU4Oh00/6tCjLUJOT6/FqudcEDL3eInd/2g7yfFKHYVCGqyr0OMD7+xKLsNx6BXxP i/LJ03+XVazswgj4CSf22YsrNOxWPwhThoLAE8pdqzVAsHwM2gWqsTKTy93luErvYtJC +RW4Hov8fz0BqLVeS/usfRFi/w5frCLtiq4QTs98ME0Ml48BM+RkBIBczG/RJHb8HwAJ jbB6Ht9tCcWLjYEivIfJz0y5UGHh0De+c6ir7XwsjLzt+mbeH0UsQdAEcbZe64GY914M aZEw== 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=8bs3sq1/e4iSZMQcW3fK8/nzXrhFq9X2q8Ju1Tl73z4=; b=r+ocishLI2oGlm4y5IqQFcoPfUWOAArlP5Ui9aGKGG8PKEUsu9747+pExb4YLXuR/w gzvlVgVCRBOdzxYUN3pLE7Bicq+EDcbnlqCoqVcjkBHuplYxg992wk7TxBLAoH28wC9V xvEoHH9ikXgFCCjhyqBAElLwhUEJkJcZQHZbOscd3lEi5PDU6LAwn/5Gjz3tpiy3t7te via+J0W4d4Y1NK0YBT1ruBThsnJxg+sq9+1QSR97VyQXFSofTybv9P7SxKKNPbz0YlU7 CSC85ymNjpLZLyuapN4fKxMQHIktT0KQa3Vbhw+lc4xhPThrR/FZUwJlHc8ArATc2v+S TrIQ== X-Gm-Message-State: ALQs6tDndsdraJnsfxgUi5oFlBCo0Ubz/diXQqqLCzb5VP+XK90fxwNm FevMy2JxlK8ueeKkFg9cgTTstQ== X-Google-Smtp-Source: AIpwx48haMf5+Sj2MbQyCi+pwoIjCSUwH6tO1ZaDxcxtuhXxvp7/PMgyjrH7UmFpH9Uq3TPEs5Bgxw== X-Received: by 2002:a17:902:3084:: with SMTP id v4-v6mr4389855plb.262.1523608733359; Fri, 13 Apr 2018 01:38:53 -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.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 13 Apr 2018 01:38:52 -0700 (PDT) From: Masashi Honma To: hostap@lists.infradead.org Subject: [PATCH 3/3] tests: Add a mesh DFS test Date: Fri, 13 Apr 2018 17:38:36 +0900 Message-Id: <1523608716-5947-3-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: <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_013904_222342_B574F9DB X-CRM114-Status: GOOD ( 11.08 ) 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:241 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: j@w1.fi, Masashi Honma , peter.oh@bowerswilkins.com MIME-Version: 1.0 Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Signed-off-by: Masashi Honma --- tests/hwsim/test_wpas_mesh.py | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/tests/hwsim/test_wpas_mesh.py b/tests/hwsim/test_wpas_mesh.py index c3cfb7b..94bf544 100644 --- a/tests/hwsim/test_wpas_mesh.py +++ b/tests/hwsim/test_wpas_mesh.py @@ -18,6 +18,8 @@ from utils import HwsimSkip, alloc_fail, fail_test, wait_fail_trigger from tshark import run_tshark from test_ap_ht import set_world_reg from hwsim_utils import set_group_map +from test_dfs import wait_dfs_event +from test_p2p_channel import set_country def check_mesh_support(dev, secure=False): if "MESH" not in dev.get_capability("modes"): @@ -1061,6 +1063,47 @@ def _test_mesh_open_vht_160(dev, apdev): dev[0].dump_monitor() dev[1].dump_monitor() +def test_wpas_mesh_open_dfs(dev, apdev): + """wpa_supplicant open MESH network with DFS""" + try: + _test_wpas_mesh_open_dfs(dev, apdev) + finally: + for i in range(0, 2): + dev[i].mesh_group_remove() + check_mesh_group_removed(dev[i]) + dev[i].flush_scan_cache() + dev[i].dump_monitor() + set_country("00") + +def _test_wpas_mesh_open_dfs(dev, apdev): + set_country("US") + for i in range(0, 2): + dev[i].request("SET country US") + check_mesh_support(dev[i]) + add_open_mesh_network(dev[i], freq="5260", basic_rates="60 120 240", + disable_ht40=True) + + ev = wait_dfs_event(dev[i], "DFS-CAC-START", 5) + if "DFS-CAC-START" not in ev: + # For now, assume DFS is not supported by all kernel builds. + raise HwsimSkip("CAC did not start - assume not supported") + + ev = wait_dfs_event(dev[i], "DFS-CAC-COMPLETED", 70) + if "success=1" not in ev: + raise Exception("CAC failed") + if "freq=5260" not in ev: + raise Exception("Unexpected DFS freq result") + + # Check for mesh joined + check_mesh_group_added(dev[i]) + + # Check for peer connected + for i in range(0, 2): + check_mesh_peer_connected(dev[i]) + + # Test connectivity 0->1 and 1->0 + hwsim_utils.test_connectivity(dev[0], dev[1]) + def test_wpas_mesh_password_mismatch(dev, apdev): """Mesh network and one device with mismatching password""" check_mesh_support(dev[0], secure=True)