From patchwork Wed Nov 22 09:19:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinayak Yadawad X-Patchwork-Id: 1867257 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.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=M1C5TzPP; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=broadcom.com header.i=@broadcom.com header.a=rsa-sha256 header.s=google header.b=OzO1Gk5J; dkim-atps=neutral Authentication-Results: legolas.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=patchwork.ozlabs.org) 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 ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SZwj35v8bz1ySN for ; Wed, 22 Nov 2023 20:21:11 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: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-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=K/FJA194zDW+/Skw4HVKiVKHiTj3Zhf2Xw3hKQgSUrU=; b=M1C 5TzPPoujO4qIsWEKTJcgPt59cK/1CgdetRSHcoVhNsdmlgjy2TAAYbZnMlg4x3kjDBVgJM5CKENu2 Zw/DunfeOcsrSXQJ19+dpcXDK/7jIKmlrhFzKzFVax9Kc57gW6Hujo9E+qihfDuh8xSMbRfk2b8iD /DFYpnQ4lHT3WXZ/mDqc+hsJb9QlPd7FZVyCGloSMJHDb+ecz5X20DPlSEs+bLsvg8lhXS+1DMVoD ggavtd+BRkbkpXq+fkQJdyXf9hf12iyF+0nA1tg2OFvdlvZnDT1b+qT8pm1pnDkEDF31pYSVu8jgP ZcEXRAErjcbvP+SyZe2WPk50FwQ78ZQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1r5jP0-001Bdu-2f; Wed, 22 Nov 2023 09:20:10 +0000 Received: from mail-il1-x134.google.com ([2607:f8b0:4864:20::134]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1r5jOx-001Bd1-2s for hostap@lists.infradead.org; Wed, 22 Nov 2023 09:20:09 +0000 Received: by mail-il1-x134.google.com with SMTP id e9e14a558f8ab-35beca6d020so1314315ab.0 for ; Wed, 22 Nov 2023 01:20:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1700644804; x=1701249604; darn=lists.infradead.org; h=mime-version:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=ko8xf83QWTjk6FMur57238YtLDRe2zsrTYPf3mg6XsQ=; b=OzO1Gk5Jg3rwl2clDWxn9h95YJP5H4EQ3kfCKIQ1TS3t74WmXCwtRTwXWFERADoj7z u/Uw3waOb38YXsRs6plhcpFHzml4eF4PaRYoQHpH//IIMJxhrxabvPa86XbFMvAkd+Ae FKQmfwQ+QvWQOdkjrZjXtUJemXBkEcwX2btIc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700644804; x=1701249604; h=mime-version:message-id:date:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=ko8xf83QWTjk6FMur57238YtLDRe2zsrTYPf3mg6XsQ=; b=q/AXvaDxnQKBJV0HdeoWRgvjZ6QEaXZ8jbPlakhvZkTHjz3jWC7p3/P4NlHf46CcdQ m0X7GYxOhP8G9SNoOXlCyQ5tIUPwOIgRdvdKX2bJUeYuwf1vf/HTlxYgVQUDwX8/1e4F s24twqb2E9+oQXxJzm2jzhLPHwB5rmCRVf53Zfo+e+OhTnYilTHi6Y1OscbFu9NGUIp1 SV1UZvvXKUOEYH+DzCcdb11EKGi6ju78u4wp3QBynozLxOJXskuW6kH7k2BgKr5fWEpM p+2A5T7o892QPUPZ2FpvJV+b5l355ruf/2YilrVwN0YFvxu6SaqUXtcdrFM2l3tXgRqI y5lQ== X-Gm-Message-State: AOJu0YwA7YeoD6SO1D/PnJGQ6oQpEQDAdctrniSCwheeWJ4rxi4pwURU vVaDkevq+J8ZbzB/c0bx99zeonQM5e3rsJbZlWISGGh98jTnEb/h8+LXd2IRGROrqUsCjeclylJ oMwmiKAvTI0l5SAb8D/BQ5/5IlUSgpOMxHdkoOKF3/PGrYnW03LI3dLmyepXm4gVoFNa5m0vWQb mT6zG6vwJrTE5giw== X-Google-Smtp-Source: AGHT+IFVbHRKVPsxfhBfEq7KFYzCDveaQmfYEZPVfQTQgmel5qTLgJy5orA/DjeyxEjU8Gj2rIGQYA== X-Received: by 2002:a92:dc52:0:b0:35a:fac6:8825 with SMTP id x18-20020a92dc52000000b0035afac68825mr1515200ilq.22.1700644804385; Wed, 22 Nov 2023 01:20:04 -0800 (PST) Received: from ibnvda0196.ibn.broadcom.net ([192.19.252.250]) by smtp.gmail.com with ESMTPSA id gx17-20020a056a001e1100b006c7ca969858sm9327028pfb.82.2023.11.22.01.20.02 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Nov 2023 01:20:03 -0800 (PST) From: Vinayak Yadawad To: hostap@lists.infradead.org Cc: jithu.jance@broadcom.com, Vinayak Yadawad Subject: [PATCH v2 1/1] hostapd: Fix reference to correct driver capability flag Date: Wed, 22 Nov 2023 14:49:52 +0530 Message-Id: <8f2a88a584f075c9732cb9383d0c927d5538ca51.1700644647.git.vinayak.yadawad@broadcom.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231122_012007_990769_BB466415 X-CRM114-Status: GOOD ( 14.20 ) X-Spam-Score: 0.6 (/) 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: Current change fixes reference to the appropriate driver capability flags2. Additional debug prints are added for the purpose of debuggability. Signed-off-by: Vinayak Yadawad --- v1->v2: More bug fixes identified --- src/ap/drv_callbacks.c | 2 +- src/drivers/driver_nl80211.c | 24 ++++++++++++++++-------- wpa_sup [...] Content analysis details: (0.6 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:134 listed in] [list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 SPF_NONE SPF: sender 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 1.0 MIME_NO_TEXT No (properly identified) text body parts -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 Current change fixes reference to the appropriate driver capability flags2. Additional debug prints are added for the purpose of debuggability. Signed-off-by: Vinayak Yadawad --- v1->v2: More bug fixes identified --- src/ap/drv_callbacks.c | 2 +- src/drivers/driver_nl80211.c | 24 ++++++++++++++++-------- wpa_supplicant/events.c | 2 +- wpa_supplicant/wpa_supplicant.c | 2 +- 4 files changed, 19 insertions(+), 11 deletions(-) diff --git a/src/ap/drv_callbacks.c b/src/ap/drv_callbacks.c index e58cb9f52..7c79f0672 100644 --- a/src/ap/drv_callbacks.c +++ b/src/ap/drv_callbacks.c @@ -775,7 +775,7 @@ skip_wpa_check: #ifdef CONFIG_OWE if ((hapd->conf->wpa_key_mgmt & WPA_KEY_MGMT_OWE) && - !(iface->drv_flags & WPA_DRIVER_FLAGS2_OWE_OFFLOAD_AP) && + !(iface->drv_flags2 & WPA_DRIVER_FLAGS2_OWE_OFFLOAD_AP) && wpa_auth_sta_key_mgmt(sta->wpa_sm) == WPA_KEY_MGMT_OWE && elems.owe_dh) { u8 *npos; diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c index ac63e6405..bce9220de 100644 --- a/src/drivers/driver_nl80211.c +++ b/src/drivers/driver_nl80211.c @@ -5111,17 +5111,25 @@ static int wpa_driver_nl80211_set_ap(void *priv, goto fail; if ((params->key_mgmt_suites & WPA_KEY_MGMT_PSK) && - (drv->capa.flags & WPA_DRIVER_FLAGS2_4WAY_HANDSHAKE_AP_PSK) && - params->psk_len && - nla_put(msg, NL80211_ATTR_PMK, params->psk_len, params->psk)) - goto fail; + (drv->capa.flags2 & WPA_DRIVER_FLAGS2_4WAY_HANDSHAKE_AP_PSK) && + params->psk_len) { + if (nla_put(msg, NL80211_ATTR_PMK, params->psk_len, params->psk)) { + wpa_printf(MSG_ERROR, "nl80211: Setting PSK failed"); + goto fail; + } else + wpa_printf(MSG_DEBUG, "nl80211: Setting PSK for offload"); + } if (wpa_key_mgmt_sae(params->key_mgmt_suites) && (drv->capa.flags2 & WPA_DRIVER_FLAGS2_SAE_OFFLOAD_AP) && - params->sae_password && - nla_put(msg, NL80211_ATTR_SAE_PASSWORD, - os_strlen(params->sae_password), params->sae_password)) - goto fail; + params->sae_password) { + if (nla_put(msg, NL80211_ATTR_SAE_PASSWORD, + os_strlen(params->sae_password), params->sae_password)) { + wpa_printf(MSG_ERROR, "nl80211: Setting SAE password failed"); + goto fail; + } else + wpa_printf(MSG_DEBUG, "nl80211: SAE password for offload"); + } if (params->key_mgmt_suites & WPA_KEY_MGMT_IEEE8021X_NO_WPA && (!params->pairwise_ciphers || diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c index 0e5b6c6a8..372d0535e 100644 --- a/wpa_supplicant/events.c +++ b/wpa_supplicant/events.c @@ -3376,7 +3376,7 @@ static int wpa_supplicant_event_associnfo(struct wpa_supplicant *wpa_s, #ifdef CONFIG_OWE if (wpa_s->key_mgmt == WPA_KEY_MGMT_OWE && - !(wpa_s->drv_flags & WPA_DRIVER_FLAGS2_OWE_OFFLOAD_STA) && + !(wpa_s->drv_flags2 & WPA_DRIVER_FLAGS2_OWE_OFFLOAD_STA) && (!bssid_known || owe_process_assoc_resp(wpa_s->wpa, wpa_s->valid_links ? diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c index a292f05da..38399d640 100644 --- a/wpa_supplicant/wpa_supplicant.c +++ b/wpa_supplicant/wpa_supplicant.c @@ -3617,7 +3617,7 @@ static u8 * wpas_populate_assoc_ies( #endif /* CONFIG_TESTING_OPTIONS */ if (algs == WPA_AUTH_ALG_OPEN && ssid->key_mgmt == WPA_KEY_MGMT_OWE && - !(wpa_s->drv_flags & WPA_DRIVER_FLAGS2_OWE_OFFLOAD_STA)) { + !(wpa_s->drv_flags2 & WPA_DRIVER_FLAGS2_OWE_OFFLOAD_STA)) { struct wpabuf *owe_ie; u16 group;