From patchwork Thu Aug 22 19:43:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?SXN0dsOhbiBCb2Ruw6Fy?= X-Patchwork-Id: 1151772 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="YdxsWipH"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="dziZji0O"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46Dw2J5Vn0z9sN1 for ; Fri, 23 Aug 2019 05:43:52 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Type:To:Subject: Message-ID:Date:From:MIME-Version:Reply-To:Cc:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=/Sgw/2+OJqLU4znv6a7Dp1wcpaFg6a2YjNC4tEFkf/0=; b=YdxsWipH5ua1htoD+0buEHMBmn nd4fpoJCrk+T4NRRlYGEp8nXwbl1uhdKrGohd32Lv/zKLGM2mC8Q4jPOqUEP0BLxlFZn8arMBmXed 2jwtmYFdgNrfsWOINZQ1MdTmEQGBkRuTymm4youP2GnhmrsHEo6GtV1+pSglkAaHL4ZjFuCWOWoeB AGY9e53X34zPmUGJTGxT2wcWrj4OlW5ykB/1MUX+owvsL68AYciI0iuHkiz5i4rSQ3UA6ZWTsGYk9 SzVBV3CD0FkpwN/TxBeFw0XCpXvwuJhsP0OkJI5nQQjVmL6iSrQpAS1UUdQoVzDI0BhIV2jTFHwQG tI5XCD4g==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1i0szt-0006HA-8C; Thu, 22 Aug 2019 19:43:49 +0000 Received: from mail-io1-xd44.google.com ([2607:f8b0:4864:20::d44]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1i0szq-0006Gn-Tq for hostap@lists.infradead.org; Thu, 22 Aug 2019 19:43:48 +0000 Received: by mail-io1-xd44.google.com with SMTP id j5so14441076ioj.8 for ; Thu, 22 Aug 2019 12:43:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=iVe5yljIYKN8wP3p+k4QZWgcARAotrg1+hII7LTqQAA=; b=dziZji0Oc65gELJvd+5IOBRiNrD34+aG+5sO0gx8NXbrfdhgcZ0yA6tGnXjjStyYmo AnBeWB0/VWFPgBp1vXgjMdhPyzKeO/HeY5WcwStfJUtmxE+yNLcZ0MTfVewB8nZ3hS0R m34/gd+EwCClFLlqadIRciStCL+IMgqGWsovuVBqQTdwuprhMOQ5aXn3r3ceQKmOeRA4 u02WAinerItdQiTHok3CGPXEacOltSEA++JUYOU23PZRn5ZLjEXYGvlZEaY+b2SW4yGR u6/aTBqFeB1fsrcSalovtpmIVUfbwiHr4gQK1qPc3uKI2hbldG8hYLL/yV+FrhEHYzhh qMeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=iVe5yljIYKN8wP3p+k4QZWgcARAotrg1+hII7LTqQAA=; b=Os/wB70szzW5fxqICOuIVKnrfhBFy6eb8WOumij6ax0XojoVTd/IRniEyDB2cKojSz At801RRv8+HFTPNRA4VcrTSRek5NGzgFC1rCw7d6Dki0JN/LzsIWzf5T+h2L61loE9aS gMfmuxscWE2NF8BMoG1qqR9yXD/1UkwZabyM1rfVkCjhGJ6W2J6zartn2JvNWnaxPmDa CdQi72ocRUDXTdGH41vDRczPRp44eE5FZ7waUuzCiATIxOkEI73Td5RurbILfxYbbiUd 55mndbD1czeSS8D4qv9UQ5w1rRcg9Yd6GNOZdd72UIP5LgaQlswLhqmzxCK3KDvYorxR 2ElA== X-Gm-Message-State: APjAAAUVPj0B1Ir5bKQiLXyYCyEz6X3VBTv10VmluRjqVDaSDk3usvrJ 8nISczoDURPAjGMddjmYYGJSOOwHyoTlbkHiVQtPjWSaD1Y= X-Google-Smtp-Source: APXvYqzou3jUALAC8CcbUWBbJ5aDIpzApKDzXbtTikLKBst96cINsuHXnO2Av633pBMBgPhsVM8ZSb9acj+sKQsYcls= X-Received: by 2002:a5d:96cb:: with SMTP id r11mr1827154iol.200.1566503025425; Thu, 22 Aug 2019 12:43:45 -0700 (PDT) MIME-Version: 1.0 From: =?utf-8?b?SXN0dsOhbiBCb2Ruw6Fy?= Date: Thu, 22 Aug 2019 21:43:34 +0200 Message-ID: Subject: [PATCH] wpa_supplicant: If empty bytearray sent via DBUS use default value To: hostap@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190822_124346_989466_47F3D243 X-CRM114-Status: UNSURE ( 9.96 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) 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:d44 listed in] [list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (mail.bodnaristvan[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.0 FROM_EXCESS_BASE64 From: base64 encoded unnecessarily X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.29 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 In case wpa_supplicant receive empty byte array via dbus (e.g.: from Network Manager which sends empty private key password field) it will use the "NULL" default value. Signed-off-by: Istvan Bodnar --- wpa_supplicant/dbus/dbus_new_handlers.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) goto error; } else if (entry.type == DBUS_TYPE_STRING) { From 230b2f6857b136858d6dd6b815e5b86906cc13fc Mon Sep 17 00:00:00 2001 From: Istvan Bodnar Date: Thu, 22 Aug 2019 21:26:43 +0200 Subject: [PATCH] wpa_supplicant: If empty bytearray sent via DBUS use default value In case wpa_supplicant receive empty byte array via dbus (e.g.: from Network Manager which sends empty private key password field) it will use the "NULL" default value. Signed-off-by: Istvan Bodnar --- wpa_supplicant/dbus/dbus_new_handlers.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/wpa_supplicant/dbus/dbus_new_handlers.c b/wpa_supplicant/dbus/dbus_new_handlers.c index 6c36d91a0..45c16c2e7 100644 --- a/wpa_supplicant/dbus/dbus_new_handlers.c +++ b/wpa_supplicant/dbus/dbus_new_handlers.c @@ -206,17 +206,25 @@ dbus_bool_t set_network_properties(struct wpa_supplicant *wpa_s, value = NULL; if (entry.type == DBUS_TYPE_ARRAY && entry.array_type == DBUS_TYPE_BYTE) { - if (entry.array_len <= 0) + if (entry.array_len < 0) goto error; + if (entry.array_len == 0) + size = strlen("NULL") + 3; + else + size = entry.array_len * 2 + 1; - size = entry.array_len * 2 + 1; value = os_zalloc(size); if (value == NULL) goto error; - ret = wpa_snprintf_hex(value, size, - (u8 *) entry.bytearray_value, - entry.array_len); + if (entry.array_len == 0) + ret = os_snprintf(value, size, "\"%s\"", + "NULL"); + else + ret = wpa_snprintf_hex(value, size, + (u8 *) entry.bytearray_value, + entry.array_len); + if (ret <= 0) goto error; } else if (entry.type == DBUS_TYPE_STRING) { -- 2.17.1