From patchwork Wed Jun 15 19:55:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kaidong Wang X-Patchwork-Id: 1643965 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=teauITDG; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=gwgbt50/; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LNbhG0z3bz9sGC for ; Thu, 16 Jun 2022 05:58:05 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :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=ISDp65xQW8gPfP0V1nsIYJlO8alKR9T91p/8THww0QI=; b=teauITDGWskdkH HPtfoQqCydBgA0S/VQfqA0OeMyJ2qhSIcvKlbsbXcQjSCO8dRcGlrjF3Zi5Wvz0P8Wwdpy7KfViv9 WDa5E4BS6lC0+9SPsZ2MhgtxzmLVce1LDbc7R0n+aLeOhWb54aCBh7aSApwz55XckmW03BaqhiXu3 C7rzUg0MENb6Ml4mdem2zRuF8Om8BSbJsbLymwvwWEUGcuNDJffUJQBDToIZraed23NbnAAe2sJEF bUB52d5SLQY6XC8XCoEm7N7M0kGY6zTB33t4EN/nmwEYZDg2H3cFicSv73+13GFb23EzEknDq8Aix 2bEznffvIX3lETeUNdNQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o1Z80-00G9Zt-HB; Wed, 15 Jun 2022 19:56:36 +0000 Received: from mail-pj1-x1031.google.com ([2607:f8b0:4864:20::1031]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1o1Z7v-00G9Xf-QB for hostap@lists.infradead.org; Wed, 15 Jun 2022 19:56:33 +0000 Received: by mail-pj1-x1031.google.com with SMTP id g16-20020a17090a7d1000b001ea9f820449so3115882pjl.5 for ; Wed, 15 Jun 2022 12:56:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=C4tbceT5fy7TdpLYDZyAoRI1GLw7mcTaBUJ+Qto/woA=; b=gwgbt50/I3rq4fHdqG7DKb+rQ6iDD4T4JCuInSzt9lcdZzs7sZrS3F+fovpm878Xo7 PzmO1cvG5GJxQcMnntf9Kn7X33kok3V1hV5h+uc0+wlWedX+TFFzwCroejTbKdj80sQ3 SRfEELiqis7qw9J3bpsgdJXahGU99YmPQxJCc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=C4tbceT5fy7TdpLYDZyAoRI1GLw7mcTaBUJ+Qto/woA=; b=3LC2S8jJdea2DSH13QbTG773X6/ZBlaInuHa6IqERtTb7pdoR3C3RpEEJHvXyVop8y BeUQSawRyOGS2pPm6hKxDsxCPxC2cHSHiH8XVO8zpP40PajXfLEToQfFkLXecXObcZod auMFrnK8gFvpMwWWxBy+TKPQYH8IZFFbXsregf7ZYerR+ko+pLlfTrAGMs2lsC2iaYzj CLFbDN2Ld/0CMEhmzs0soOKZOLfgrUJ9cH0bvKIWR3bXROp9otk5aqAc9FOM46t2ykia glD2db122JmMjX9+cJQWfb3Z9p988igvztORLNsloIl2JJqbZjOkO8N8v1kmdPUb1hW7 qKRQ== X-Gm-Message-State: AJIora+gii7Cf10oaKw94WCZ3rH/RXUyI+QAtbwIbD3nOA82CX4uU1JZ HonGyoDCyfb2YBwvp8xnpyZLjYLdshyyeA== X-Google-Smtp-Source: AGRyM1v0yjGDJcq3d3hRPGhruxVVav/IiMLWblv9ruJcA4iDpwXLwStHxi1/k7FBg1wF0d9kA1qFBQ== X-Received: by 2002:a17:90b:1d08:b0:1e3:2a4f:6935 with SMTP id on8-20020a17090b1d0800b001e32a4f6935mr12158914pjb.174.1655322984637; Wed, 15 Jun 2022 12:56:24 -0700 (PDT) Received: from kaidong.c.googlers.com.com (254.80.82.34.bc.googleusercontent.com. [34.82.80.254]) by smtp.gmail.com with ESMTPSA id f4-20020a056a00228400b0051be2ae1fb5sm30672pfe.61.2022.06.15.12.56.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jun 2022 12:56:24 -0700 (PDT) From: Kaidong Wang To: hostap@lists.infradead.org Cc: Kaidong Wang Subject: [PATCH] wpa_supplicant: Convert SSID into printable form before printing Date: Wed, 15 Jun 2022 19:55:43 +0000 Message-Id: <20220615195543.237383-1-kaidong@chromium.org> X-Mailer: git-send-email 2.36.1.476.g0c4daa206d-goog MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220615_125631_927299_D40507C2 X-CRM114-Status: GOOD ( 10.17 ) X-Spam-Score: -0.4 (/) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: SSID may include unprintable characters. This change converts unprintable characters into printable form before printing SSID in the function wpas_send_ctrl_req(). The conversion is based on the funct [...] Content analysis details: (-0.4 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:1031 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -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_EF Message has a valid DKIM or DK signature from envelope-from domain -0.2 DKIMWL_WL_HIGH DKIMwl.org - High trust sender X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org SSID may include unprintable characters. This change converts unprintable characters into printable form before printing SSID in the function wpas_send_ctrl_req(). The conversion is based on the function wpa_ssid_txt(). Signed-off-by: Kaidong Wang --- wpa_supplicant/wpas_glue.c | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/wpa_supplicant/wpas_glue.c b/wpa_supplicant/wpas_glue.c index d62914bc1..6f65aea2d 100644 --- a/wpa_supplicant/wpas_glue.c +++ b/wpa_supplicant/wpas_glue.c @@ -938,28 +938,8 @@ const char * wpa_supplicant_ctrl_req_to_string(enum wpa_ctrl_req_type field, void wpas_send_ctrl_req(struct wpa_supplicant *wpa_s, struct wpa_ssid *ssid, const char *field_name, const char *txt) { - char *buf; - size_t buflen; - int len; - - buflen = 100 + os_strlen(txt) + ssid->ssid_len; - buf = os_malloc(buflen); - if (buf == NULL) - return; - len = os_snprintf(buf, buflen, "%s-%d:%s needed for SSID ", - field_name, ssid->id, txt); - if (os_snprintf_error(buflen, len)) { - os_free(buf); - return; - } - if (ssid->ssid && buflen > len + ssid->ssid_len) { - os_memcpy(buf + len, ssid->ssid, ssid->ssid_len); - len += ssid->ssid_len; - buf[len] = '\0'; - } - buf[buflen - 1] = '\0'; - wpa_msg(wpa_s, MSG_INFO, WPA_CTRL_REQ "%s", buf); - os_free(buf); + wpa_msg(wpa_s, MSG_INFO, WPA_CTRL_REQ "%s-%d:%s needed for SSID %s", + field_name, ssid->id, txt, wpa_ssid_txt(ssid->ssid, ssid->ssid_len)); }