From patchwork Thu Oct 17 23:03:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Caruso X-Patchwork-Id: 1179057 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) 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=chromium.org Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="NF85Zvco"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="HM5M8euA"; 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 46vPqf0Q0Rz9sPV for ; Fri, 18 Oct 2019 10:04:14 +1100 (AEDT) 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=g6UTRZZ1dSW2ssjvkE2CUtmwaaTb2A2zhIDqjthpe4U=; b=NF85ZvcoDm509CE0gGbp96QONh 80k3CBvdjYfVNAGl+FjWckDXb25vBYjUand7lFZwh7I8t5Pu6ABdgONAvZKpcFmzYMEBGKWDept64 e6jgfs1KwzTve/KITj26Rbh1lttGQNRqBbgA3h7xpzYKO5fXJeM7xHVvGQpHQjt13q1QARcW9nmV3 eqv9NaEPh2Gr6Tk4/RuILucdeVn927Y3XkRnmM/zkG3irR9IlbZIY1mJ+SOHocSm0ouD25z2g7shk snuEoti3bPZxm2I33AGei2Jx18JqGMV5tVabthHHTdX1jYg2X+SwfyOGF6z3pt6HEhdUR/05hiLFM w6hNmptw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1iLEoR-000822-7p; Thu, 17 Oct 2019 23:04:07 +0000 Received: from mail-pf1-x444.google.com ([2607:f8b0:4864:20::444]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iLEoH-0007wZ-Mj for hostap@lists.infradead.org; Thu, 17 Oct 2019 23:04:01 +0000 Received: by mail-pf1-x444.google.com with SMTP id a2so2575965pfo.10 for ; Thu, 17 Oct 2019 16:03:57 -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:in-reply-to:references; bh=bygtIMUrPVJi8hMmwh9RogzKnfbfoCxWnwtVGWtNn1w=; b=HM5M8euAAeVUStujeGj9jqTyJcMXAIu3hoA+gRDszSBsWNJvjvXmmX/QQ5AuIW1QKb zub1fVFWjPAC6GgJrbR8hXKYojsvOqljI3xg7ZUFY7mg2lJJk/aQKw6kcjklLYqFZdza WTm23V1eI8Wmh1omYsBLeAPEarTk3Az8/l6js= 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=bygtIMUrPVJi8hMmwh9RogzKnfbfoCxWnwtVGWtNn1w=; b=gX0/N8fhuQT2vUm6+SsTMq3YswbjX7+POd7vN29m58OnWOklHpttt4siyoD6osECYy 6f5IEVQudgHUSMoagK7oDb1WhKkWnsfy2/FWoAQsXqhd5hCWLHFG725XiS2VD74gISGB g8lLVb+F7mvXvHmsn0k0uw5j7ArT3EWkDEi1bvjpH2TMhuXDld5bSfWlYX0VEgS+AmOe /p98kBj0F/7cDMi3+nlL3qT4vB4j2OngyLgah7HTVfFS8w7NLbK8N8fA8qI8A7qUs28i kFkx2C25AyRkoi895Dfmus4xjUtSzNx1/dt7GVAAFgKW36n+eVyEqzE7jc5jXTv3AMz5 5g4g== X-Gm-Message-State: APjAAAVb4QC0zLDBJkpnjY1YgNd484yk2TSD7isLC6DLR/1/h/HYpjzq D3vcvzGHBKpe1YZqXp1BkbPZ2dzgPPE= X-Google-Smtp-Source: APXvYqyuK2B+M699KYT5s4YEYB78521O290+PJ0lR95+TDO941t+bgSoVYx1jT/GyWVugOghHIOQqQ== X-Received: by 2002:a62:1646:: with SMTP id 67mr2955873pfw.216.1571353436260; Thu, 17 Oct 2019 16:03:56 -0700 (PDT) Received: from ejcaruso1.sfo.corp.google.com ([2620:0:1002:1006:c272:92fe:54b0:9596]) by smtp.gmail.com with ESMTPSA id v4sm3910407pff.181.2019.10.17.16.03.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Oct 2019 16:03:55 -0700 (PDT) From: Eric Caruso To: hostap@lists.infradead.org Subject: [PATCH v5 1/3] Move ownership of MAC address randomization mask to scan params Date: Thu, 17 Oct 2019 16:03:50 -0700 Message-Id: <1571353432-230483-2-git-send-email-ejcaruso@chromium.org> X-Mailer: git-send-email 2.1.2 In-Reply-To: <1571353432-230483-1-git-send-email-ejcaruso@chromium.org> References: <1571353432-230483-1-git-send-email-ejcaruso@chromium.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191017_160357_766973_753E0FD6 X-CRM114-Status: GOOD ( 14.43 ) 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:444 listed in] [list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 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.0 DKIMWL_WL_HIGH DKIMwl.org - Whitelisted High sender 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: , Cc: Jouni Malinen , Dan Williams MIME-Version: 1.0 Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org This array can be freed either from the scan parameters or from clearing the MAC address randomization parameters from the wpa_supplicant struct. To make this ownership more clear, we have each struct own its own copy of the parameters. Signed-off-by: Eric Caruso --- wpa_supplicant/scan.c | 68 ++++++++++++++++++++++--------------------- 1 file changed, 35 insertions(+), 33 deletions(-) diff --git a/wpa_supplicant/scan.c b/wpa_supplicant/scan.c index 7abb028dd..c0d07be81 100644 --- a/wpa_supplicant/scan.c +++ b/wpa_supplicant/scan.c @@ -79,6 +79,32 @@ static int wpas_wps_in_use(struct wpa_supplicant *wpa_s, #endif /* CONFIG_WPS */ +static int wpa_setup_mac_addr_rand_params(struct wpa_driver_scan_params *params, + const u8 *mac_addr) +{ + u8 *tmp; + + if (params->mac_addr) { + os_free((u8 *) params->mac_addr); + params->mac_addr = NULL; + } + + params->mac_addr_rand = 1; + + if (!mac_addr) + return 0; + + tmp = os_malloc(2 * ETH_ALEN); + if (!tmp) + return -1; + + os_memcpy(tmp, mac_addr, 2 * ETH_ALEN); + params->mac_addr = tmp; + params->mac_addr_mask = tmp + ETH_ALEN; + return 0; +} + + /** * wpa_supplicant_enabled_networks - Check whether there are enabled networks * @wpa_s: Pointer to wpa_supplicant data @@ -1212,11 +1238,7 @@ ssid_list_set: if ((wpa_s->mac_addr_rand_enable & MAC_ADDR_RAND_SCAN) && wpa_s->wpa_state <= WPA_SCANNING) { - params.mac_addr_rand = 1; - if (wpa_s->mac_addr_scan) { - params.mac_addr = wpa_s->mac_addr_scan; - params.mac_addr_mask = wpa_s->mac_addr_scan + ETH_ALEN; - } + wpa_setup_mac_addr_rand_params(¶ms, wpa_s->mac_addr_scan); } if (!is_zero_ether_addr(wpa_s->next_scan_bssid)) { @@ -1286,6 +1308,7 @@ scan: wpabuf_free(extra_ie); os_free(params.freqs); os_free(params.filter_ssids); + os_free(params.mac_addr); if (ret) { wpa_msg(wpa_s, MSG_WARNING, "Failed to initiate AP scan"); @@ -1665,12 +1688,7 @@ scan: if ((wpa_s->mac_addr_rand_enable & MAC_ADDR_RAND_SCHED_SCAN) && wpa_s->wpa_state <= WPA_SCANNING) { - params.mac_addr_rand = 1; - if (wpa_s->mac_addr_sched_scan) { - params.mac_addr = wpa_s->mac_addr_sched_scan; - params.mac_addr_mask = wpa_s->mac_addr_sched_scan + - ETH_ALEN; - } + wpa_setup_mac_addr_rand_params(¶ms, wpa_s->mac_addr_sched_scan); } wpa_scan_set_relative_rssi_params(wpa_s, scan_params); @@ -1678,6 +1696,7 @@ scan: ret = wpa_supplicant_start_sched_scan(wpa_s, scan_params); wpabuf_free(extra_ie); os_free(params.filter_ssids); + os_free(params.mac_addr); if (ret) { wpa_msg(wpa_s, MSG_WARNING, "Failed to initiate sched scan"); if (prev_state != wpa_s->wpa_state) @@ -2535,23 +2554,9 @@ wpa_scan_clone_params(const struct wpa_driver_scan_params *src) params->sched_scan_plans_num = src->sched_scan_plans_num; } - if (src->mac_addr_rand) { - params->mac_addr_rand = src->mac_addr_rand; - - if (src->mac_addr && src->mac_addr_mask) { - u8 *mac_addr; - - mac_addr = os_malloc(2 * ETH_ALEN); - if (!mac_addr) - goto failed; - - os_memcpy(mac_addr, src->mac_addr, ETH_ALEN); - os_memcpy(mac_addr + ETH_ALEN, src->mac_addr_mask, - ETH_ALEN); - params->mac_addr = mac_addr; - params->mac_addr_mask = mac_addr + ETH_ALEN; - } - } + if (src->mac_addr_rand && + wpa_setup_mac_addr_rand_params(params, (const u8 *)src->mac_addr)) + goto failed; if (src->bssid) { u8 *bssid; @@ -2739,17 +2744,14 @@ int wpas_start_pno(struct wpa_supplicant *wpa_s) if ((wpa_s->mac_addr_rand_enable & MAC_ADDR_RAND_PNO) && wpa_s->wpa_state <= WPA_SCANNING) { - params.mac_addr_rand = 1; - if (wpa_s->mac_addr_pno) { - params.mac_addr = wpa_s->mac_addr_pno; - params.mac_addr_mask = wpa_s->mac_addr_pno + ETH_ALEN; - } + wpa_setup_mac_addr_rand_params(¶ms, wpa_s->mac_addr_pno); } wpa_scan_set_relative_rssi_params(wpa_s, ¶ms); ret = wpa_supplicant_start_sched_scan(wpa_s, ¶ms); os_free(params.filter_ssids); + os_free(params.mac_addr); if (ret == 0) wpa_s->pno = 1; else From patchwork Thu Oct 17 23:03:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Caruso X-Patchwork-Id: 1179060 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) 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=chromium.org Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="c73NQIad"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="P0I+ptVI"; 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 46vPr12vFvz9sPF for ; Fri, 18 Oct 2019 10:04:33 +1100 (AEDT) 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=NF9xDQfeypdL3EvlNEYN1nBzNGJFftBBwWI7MwDoQAQ=; b=c73NQIadJeqCnCO/7EGB2vavzI bXyS0iZsbZ/33llK2VMJ9OiXws6MSUMOXNrakKng+AtATqmxagS/CxMiVtd2Fcwgx4m8Jmrkkn9tw YRBbgKkv4uch9gDl93A5xra4F0YwAK+yClKRsvupi5r+PdeTRa7XK8hDOrJS6XWYXMBll9lGLaa8G +ddmKhl+RV9tlDCtmbYdq19j+PryyVsmxVhAVf/sLUYzb3DR+/NTbVwzU/Orm297+nRnxs0Ug8iyq 2FzyKhV1swkvW+ZWuiqZlIh7VBbVKFFeqnXb1sXd+9lEoyFLE5JV9QZdsl6RpI2sSKHcFteMlzluP LSss8ETg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1iLEon-0008Po-MM; Thu, 17 Oct 2019 23:04:29 +0000 Received: from mail-pg1-x544.google.com ([2607:f8b0:4864:20::544]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iLEoJ-0007wn-7l for hostap@lists.infradead.org; Thu, 17 Oct 2019 23:04:03 +0000 Received: by mail-pg1-x544.google.com with SMTP id p1so2215755pgi.4 for ; Thu, 17 Oct 2019 16:03:58 -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:in-reply-to:references; bh=T7l06NIjoj0BlJtsOjxkqZ2MlKVgsR3J4QhFcHilrjc=; b=P0I+ptVIvLsUKTWdY/UpLx64dJ1PguvmmXFC2jJb+XLcdR4/xUCtzbAZAbDMSLg8gQ YWZetBHVfDADTG7cCLZ1HBubcUWiSK+KfTAJOxPWcBOaQ1kGGF+GRIhAAkqwJ3UG8gEd YeshzNXS/+uOMD6yFA8waNrz8EKkDQGVgDVxE= 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=T7l06NIjoj0BlJtsOjxkqZ2MlKVgsR3J4QhFcHilrjc=; b=AzNYiLZKpiFrUC1ct/rGTcg8UUQGK5lJ+fiG1mTb8itwdGGhlsRYOdcmIqf1r4QOp/ aJCewRWTLyQ1HjVBG+2E/Rm9+FnMFfZGiQbeRNkRalbEQW/AZziByWVWieeTHQIJr2Ox S3qjWnziBnkpt2kwE3G77y7b/de9a0VvZLNzG5ud4TN9u+hIQxyRlQtJ/zF/cIIKFlRU eZ+LvtIXVtFtCtk9zC3W3GbqDmwvwtrL5haXKEOaZ88iI6dLE5YLQ8AmGw7W/9/bP7Jj Sd15cqh/PluE7NJwrz+UDl+FwrmRS0USwXFbC0/M/7yp3iLfaN18l+I5sOfWgLX/QBFf Of/g== X-Gm-Message-State: APjAAAV0Cy6w5DBWRX2yNYTOLjAC98xSLLEoBUwUU0Oyx0xTJvf/ra6x v4c2+iH+ZEk1wtCHy+S8DNOQMuwjND8= X-Google-Smtp-Source: APXvYqwoWJM0t9rzI0HQxcuHoGmTYkDAer0jUvgczGzIsylhJTODfTU7BBmEnikGMcB9K6+5AX5yJA== X-Received: by 2002:a62:ce01:: with SMTP id y1mr2903702pfg.176.1571353437216; Thu, 17 Oct 2019 16:03:57 -0700 (PDT) Received: from ejcaruso1.sfo.corp.google.com ([2620:0:1002:1006:c272:92fe:54b0:9596]) by smtp.gmail.com with ESMTPSA id v4sm3910407pff.181.2019.10.17.16.03.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Oct 2019 16:03:56 -0700 (PDT) From: Eric Caruso To: hostap@lists.infradead.org Subject: [PATCH v5 2/3] Add MAC address randomization endpoints to D-Bus Date: Thu, 17 Oct 2019 16:03:51 -0700 Message-Id: <1571353432-230483-3-git-send-email-ejcaruso@chromium.org> X-Mailer: git-send-email 2.1.2 In-Reply-To: <1571353432-230483-1-git-send-email-ejcaruso@chromium.org> References: <1571353432-230483-1-git-send-email-ejcaruso@chromium.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191017_160359_278606_45B6971F X-CRM114-Status: GOOD ( 18.06 ) 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:544 listed in] [list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 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.0 DKIMWL_WL_HIGH DKIMwl.org - Whitelisted High sender 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: , Cc: Jouni Malinen , Dan Williams MIME-Version: 1.0 Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Add D-Bus property: * MACAddressRandomizationMask: a{say} which configure random MAC address functionality in the Wi-Fi driver via netlink. Signed-off-by: Eric Caruso --- doc/dbus.doxygen | 6 + wpa_supplicant/dbus/dbus_new.c | 6 + wpa_supplicant/dbus/dbus_new_handlers.c | 154 ++++++++++++++++++++++++ wpa_supplicant/dbus/dbus_new_handlers.h | 2 + wpa_supplicant/scan.c | 26 ++++ wpa_supplicant/scan.h | 2 + 6 files changed, 196 insertions(+) diff --git a/doc/dbus.doxygen b/doc/dbus.doxygen index 072ed3486..9bca70cb7 100644 --- a/doc/dbus.doxygen +++ b/doc/dbus.doxygen @@ -1043,6 +1043,12 @@ fi.w1.wpa_supplicant1.CreateInterface.

WpsPriority - s - (read/write)

Priority for the networks added through WPS

+ +
  • +

    MACAddressRandomizationMask - a{say} - (read/write)

    +

    Masks to show which bits not to randomize with MAC address randomization. Possible keys are "scan", "sched_scan", and "pno". Values must be an array of 6 bytes.

    +

    When this property is set, the new dictionary replaces the old value, rather than merging them together. Leaving a key out of the dictionary will turn off MAC address randomization for that scan type.

    +
    • \subsection dbus_interface_signals Signals diff --git a/wpa_supplicant/dbus/dbus_new.c b/wpa_supplicant/dbus/dbus_new.c index fc2fc2ef1..f277c04fb 100644 --- a/wpa_supplicant/dbus/dbus_new.c +++ b/wpa_supplicant/dbus/dbus_new.c @@ -3803,6 +3803,12 @@ static const struct wpa_dbus_property_desc wpas_dbus_interface_properties[] = { NULL, NULL }, + { "MACAddressRandomizationMask", WPAS_DBUS_NEW_IFACE_INTERFACE, + "a{say}", + wpas_dbus_getter_mac_address_randomization_mask, + wpas_dbus_setter_mac_address_randomization_mask, + NULL + }, { NULL, NULL, NULL, NULL, NULL, NULL } }; diff --git a/wpa_supplicant/dbus/dbus_new_handlers.c b/wpa_supplicant/dbus/dbus_new_handlers.c index d2c84e5c5..f107f87e8 100644 --- a/wpa_supplicant/dbus/dbus_new_handlers.c +++ b/wpa_supplicant/dbus/dbus_new_handlers.c @@ -3983,6 +3983,160 @@ out: } +/** + * wpas_dbus_setter_mac_address_randomization_mask - Set masks used for + * MAC address randomization + * @iter: Pointer to incoming dbus message iter + * @error: Location to store error on failure + * @user_data: Function specific data + * Returns: TRUE on success, FALSE on failure + * + * Setter for "MACAddressRandomizationMask" property. + */ +dbus_bool_t wpas_dbus_setter_mac_address_randomization_mask( + const struct wpa_dbus_property_desc *property_desc, + DBusMessageIter *iter, DBusError *error, void *user_data) +{ + struct wpa_supplicant *wpa_s = user_data; + DBusMessageIter variant_iter, dict_iter, entry_iter, array_iter; + const char *key; + unsigned int rand_type = 0; + const u8 *mask; + int mask_len; + unsigned int rand_types_to_disable = MAC_ADDR_RAND_ALL; + + dbus_message_iter_recurse(iter, &variant_iter); + dbus_message_iter_recurse(&variant_iter, &dict_iter); + while (dbus_message_iter_get_arg_type(&dict_iter) == + DBUS_TYPE_DICT_ENTRY) { + dbus_message_iter_recurse(&dict_iter, &entry_iter); + if (dbus_message_iter_get_arg_type(&entry_iter) != DBUS_TYPE_STRING) { + dbus_set_error(error, DBUS_ERROR_FAILED, + "%s: key not a string", __func__); + return FALSE; + } + dbus_message_iter_get_basic(&entry_iter, &key); + dbus_message_iter_next(&entry_iter); + if (dbus_message_iter_get_arg_type(&entry_iter) != DBUS_TYPE_ARRAY || + dbus_message_iter_get_element_type(&entry_iter) != DBUS_TYPE_BYTE) { + dbus_set_error(error, DBUS_ERROR_FAILED, + "%s: mask was not a byte array", __func__); + return FALSE; + } + dbus_message_iter_recurse(&entry_iter, &array_iter); + dbus_message_iter_get_fixed_array(&array_iter, &mask, &mask_len); + + if (os_strcmp(key, "scan") == 0) { + rand_type = MAC_ADDR_RAND_SCAN; + } else if (os_strcmp(key, "sched_scan") == 0) { + rand_type = MAC_ADDR_RAND_SCHED_SCAN; + } else if (os_strcmp(key, "pno") == 0) { + rand_type = MAC_ADDR_RAND_PNO; + } else { + dbus_set_error(error, DBUS_ERROR_FAILED, + "%s: bad scan type \"%s\"", __func__, key); + return FALSE; + } + + if (mask_len != ETH_ALEN) { + dbus_set_error(error, DBUS_ERROR_FAILED, + "%s: malformed MAC mask given", __func__); + return FALSE; + } + + if (wpas_enable_mac_addr_randomization( + wpa_s, rand_type, wpa_s->perm_addr, mask)) { + dbus_set_error(error, DBUS_ERROR_FAILED, + "%s: failed to set up MAC address randomization for %s", + __func__, key); + return FALSE; + } + + wpa_printf(MSG_DEBUG, "%s: Enabled MAC address randomization for %s with mask: " + MACSTR, wpa_s->ifname, key, MAC2STR(mask)); + rand_types_to_disable &= ~rand_type; + dbus_message_iter_next(&dict_iter); + } + + if (rand_types_to_disable && + wpas_disable_mac_addr_randomization(wpa_s, rand_types_to_disable)) { + dbus_set_error(error, DBUS_ERROR_FAILED, + "%s: failed to disable MAC address randomization", + __func__); + return FALSE; + } + + return TRUE; +} + + +dbus_bool_t wpas_dbus_getter_mac_address_randomization_mask( + const struct wpa_dbus_property_desc *property_desc, + DBusMessageIter *iter, DBusError *error, void *user_data) +{ + struct wpa_supplicant *wpa_s = user_data; + DBusMessageIter variant_iter, dict_iter, entry_iter, array_iter; + unsigned int i; + u8 mask_buf[ETH_ALEN]; + /* Read docs on dbus_message_iter_append_fixed_array for why this + * is necessary... */ + u8* mask = mask_buf; + static const struct { + const char *key; + unsigned int type; + } types[] = { + { "scan", MAC_ADDR_RAND_SCAN }, + { "sched_scan", MAC_ADDR_RAND_SCHED_SCAN }, + { "pno", MAC_ADDR_RAND_PNO } + }; + + if (!dbus_message_iter_open_container(iter, DBUS_TYPE_VARIANT, + "a{say}", &variant_iter) || + !dbus_message_iter_open_container(&variant_iter, DBUS_TYPE_ARRAY, + "{say}", &dict_iter)) { + dbus_set_error_const(error, DBUS_ERROR_NO_MEMORY, "no memory"); + return FALSE; + } + + for (i = 0; i < ARRAY_SIZE(types); i++) { + if (wpas_mac_addr_rand_scan_get_mask(wpa_s, types[i].type, + mask)) + continue; + + if (!dbus_message_iter_open_container(&dict_iter, + DBUS_TYPE_DICT_ENTRY, + NULL, &entry_iter) || + !dbus_message_iter_append_basic(&entry_iter, + DBUS_TYPE_STRING, + &types[i].key) || + !dbus_message_iter_open_container(&entry_iter, + DBUS_TYPE_ARRAY, + DBUS_TYPE_BYTE_AS_STRING, + &array_iter) || + !dbus_message_iter_append_fixed_array(&array_iter, + DBUS_TYPE_BYTE, + &mask, + ETH_ALEN) || + !dbus_message_iter_close_container(&entry_iter, + &array_iter) || + !dbus_message_iter_close_container(&dict_iter, + &entry_iter)) { + dbus_set_error_const(error, DBUS_ERROR_NO_MEMORY, + "no memory"); + return FALSE; + } + } + + if (!dbus_message_iter_close_container(&variant_iter, &dict_iter) || + !dbus_message_iter_close_container(iter, &variant_iter)) { + dbus_set_error_const(error, DBUS_ERROR_NO_MEMORY, "no memory"); + return FALSE; + } + + return TRUE; +} + + /** * wpas_dbus_getter_sta_address - Return the address of a connected station * @iter: Pointer to incoming dbus message iter diff --git a/wpa_supplicant/dbus/dbus_new_handlers.h b/wpa_supplicant/dbus/dbus_new_handlers.h index d922ce1b4..afa26efed 100644 --- a/wpa_supplicant/dbus/dbus_new_handlers.h +++ b/wpa_supplicant/dbus/dbus_new_handlers.h @@ -177,6 +177,8 @@ DECLARE_ACCESSOR(wpas_dbus_getter_pkcs11_engine_path); DECLARE_ACCESSOR(wpas_dbus_getter_pkcs11_module_path); DECLARE_ACCESSOR(wpas_dbus_getter_blobs); DECLARE_ACCESSOR(wpas_dbus_getter_stas); +DECLARE_ACCESSOR(wpas_dbus_getter_mac_address_randomization_mask); +DECLARE_ACCESSOR(wpas_dbus_setter_mac_address_randomization_mask); DECLARE_ACCESSOR(wpas_dbus_getter_sta_address); DECLARE_ACCESSOR(wpas_dbus_getter_sta_aid); DECLARE_ACCESSOR(wpas_dbus_getter_sta_caps); diff --git a/wpa_supplicant/scan.c b/wpa_supplicant/scan.c index c0d07be81..975bd10ce 100644 --- a/wpa_supplicant/scan.c +++ b/wpa_supplicant/scan.c @@ -2845,6 +2845,32 @@ int wpas_mac_addr_rand_scan_set(struct wpa_supplicant *wpa_s, } +int wpas_mac_addr_rand_scan_get_mask(struct wpa_supplicant *wpa_s, + unsigned int type, u8 *mask) +{ + u8 *to_copy = NULL; + + if ((wpa_s->mac_addr_rand_enable & type) != type) + return -1; + + if (type == MAC_ADDR_RAND_SCAN) { + to_copy = wpa_s->mac_addr_scan; + } else if (type == MAC_ADDR_RAND_SCHED_SCAN) { + to_copy = wpa_s->mac_addr_sched_scan; + } else if (type == MAC_ADDR_RAND_PNO) { + to_copy = wpa_s->mac_addr_pno; + } else { + wpa_printf(MSG_DEBUG, + "scan: Invalid MAC randomization type=0x%x", + type); + return -1; + } + + os_memcpy(mask, to_copy + ETH_ALEN, ETH_ALEN); + return 0; +} + + int wpas_abort_ongoing_scan(struct wpa_supplicant *wpa_s) { struct wpa_radio_work *work; diff --git a/wpa_supplicant/scan.h b/wpa_supplicant/scan.h index 2aa0a8be0..58caa7818 100644 --- a/wpa_supplicant/scan.h +++ b/wpa_supplicant/scan.h @@ -52,6 +52,8 @@ void wpas_mac_addr_rand_scan_clear(struct wpa_supplicant *wpa_s, int wpas_mac_addr_rand_scan_set(struct wpa_supplicant *wpa_s, unsigned int type, const u8 *addr, const u8 *mask); +int wpas_mac_addr_rand_scan_get_mask(struct wpa_supplicant *wpa_s, + unsigned int type, u8 *mask); int wpas_abort_ongoing_scan(struct wpa_supplicant *wpa_s); void filter_scan_res(struct wpa_supplicant *wpa_s, struct wpa_scan_results *res);