From patchwork Wed Mar 8 20:41:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Berg X-Patchwork-Id: 736710 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.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 3vdlpT5dbHz9sN9 for ; Thu, 9 Mar 2017 07:42:57 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="G6rfLuFN"; dkim-atps=neutral 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: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:In-Reply-To: References:List-Owner; bh=/IMwfYlpwtN1XV49uT7HEedX2jO3tKdboSYFaFWA9X0=; b=G6r fLuFNFqcZu06NlK293VBzIoEe6DfE5lG3zgHGwqbb5/py9fe0MAsK+T1laiaRWgcpE48djdsdlcCB F8BByPTYuptJOEHRcNU38kfuYbVYjwTo4+99O64bYOrmrKyDQF79a6GfHUlcOy5TakJ3AANwDGYk5 7u0/BGth3tPMuXn1F9LQN92RDvF0dnKWi9J047UTNq4LcpSM5UlEQCRsFcoBIC2CJkCnH6XOVl2bn /OvVEpRFJPusmGvc7u25aJC6EKT88dPxPW2tdZKKSr46vYaS81r1Kw65qsrizrZ4tuvvCnc8Nbldl 5jv/HnyOpbCAeJ1NegkYRxo9YeOjvwA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cliPW-0004Dw-59; Wed, 08 Mar 2017 20:42:14 +0000 Received: from s3.sipsolutions.net ([5.9.151.49] helo=sipsolutions.net) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cliP5-0004B7-6M for hostap@lists.infradead.org; Wed, 08 Mar 2017 20:41:50 +0000 Received: by sipsolutions.net with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89_RC7) (envelope-from ) id 1cliOf-0005JI-Bj; Wed, 08 Mar 2017 21:41:21 +0100 From: Johannes Berg To: hostap@lists.infradead.org Subject: [PATCH] wpa_supplicant: events: don't bounce timeout reason through a buffer Date: Wed, 8 Mar 2017 21:41:17 +0100 Message-Id: <20170308204117.15581-1-johannes@sipsolutions.net> X-Mailer: git-send-email 2.11.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170308_124147_495334_B1CBA299 X-CRM114-Status: UNSURE ( 7.14 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [5.9.151.49 listed in list.dnswl.org] -0.0 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 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: Johannes Berg MIME-Version: 1.0 Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Johannes Berg There's no point in making the code use a stack buffer and first copying the string there, only to copy it again to the output. Make the output directly use the reason string. Signed-off-by: Johannes Berg --- wpa_supplicant/events.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c index 500c28506c56..5501feb1715d 100644 --- a/wpa_supplicant/events.c +++ b/wpa_supplicant/events.c @@ -3618,7 +3618,6 @@ void wpa_supplicant_event(void *ctx, enum wpa_event_type event, union wpa_event_data *data) { struct wpa_supplicant *wpa_s = ctx; - char buf[100]; int resched; if (wpa_s->wpa_state == WPA_INTERFACE_DISABLED && @@ -3787,24 +3786,21 @@ void wpa_supplicant_event(void *ctx, enum wpa_event_type event, break; #endif /* CONFIG_IBSS_RSN */ case EVENT_ASSOC_REJECT: - if (data->assoc_reject.timeout_reason) - os_snprintf(buf, sizeof(buf), "=%s", - data->assoc_reject.timeout_reason); - else - buf[0] = '\0'; if (data->assoc_reject.bssid) wpa_msg(wpa_s, MSG_INFO, WPA_EVENT_ASSOC_REJECT - "bssid=" MACSTR " status_code=%u%s%s", + "bssid=" MACSTR " status_code=%u%s%s%s", MAC2STR(data->assoc_reject.bssid), data->assoc_reject.status_code, data->assoc_reject.timed_out ? " timeout" : "", - buf); + data->assoc_reject.timeout_reason ? "=" : "", + data->assoc_reject.timeout_reason ?: ""); else wpa_msg(wpa_s, MSG_INFO, WPA_EVENT_ASSOC_REJECT - "status_code=%u%s%s", + "status_code=%u%s%s%s", data->assoc_reject.status_code, data->assoc_reject.timed_out ? " timeout" : "", - buf); + data->assoc_reject.timeout_reason ? "=" : "", + data->assoc_reject.timeout_reason ?: ""); wpa_s->assoc_status_code = data->assoc_reject.status_code; wpas_notify_assoc_status_code(wpa_s); if (wpa_s->drv_flags & WPA_DRIVER_FLAGS_SME)