From patchwork Sun Aug 18 20:31:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Matyukevich X-Patchwork-Id: 1973605 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=140.211.166.137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (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 4Wn6pH1QVnz1yfR for ; Mon, 19 Aug 2024 06:31:51 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id B91D540145; Sun, 18 Aug 2024 20:31:48 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id BWqURbLa282Q; Sun, 18 Aug 2024 20:31:47 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org B30D640202 Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id B30D640202; Sun, 18 Aug 2024 20:31:47 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 8412F1BF41C for ; Sun, 18 Aug 2024 20:31:43 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 7231360602 for ; Sun, 18 Aug 2024 20:31:43 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id f_hYBLhI_3J3 for ; Sun, 18 Aug 2024 20:31:42 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::235; helo=mail-lj1-x235.google.com; envelope-from=geomatsi@gmail.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp3.osuosl.org 0A261605D1 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 0A261605D1 Received: from mail-lj1-x235.google.com (mail-lj1-x235.google.com [IPv6:2a00:1450:4864:20::235]) by smtp3.osuosl.org (Postfix) with ESMTPS id 0A261605D1 for ; Sun, 18 Aug 2024 20:31:41 +0000 (UTC) Received: by mail-lj1-x235.google.com with SMTP id 38308e7fff4ca-2f15790b472so46599421fa.0 for ; Sun, 18 Aug 2024 13:31:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724013099; x=1724617899; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Mhx6606pJO8n8FmTcH/7+Os9zHkguXL1fswNWz91vf0=; b=eERsODDsc3ZhSGmu3j7uwCXNbgwQ2CUMznyfTN5Qkjq9Khwjh8ul3WoMBDnuK8tON6 v292k71VW6uqokC37VQOlPuEsBrahCSOsMb504K8mmVZFfDyp2HyFvpo0zH5lurLzYXb tK0ERbhay+99hNFnGzDxHomIS7D7j2Re0unsa+OkSZcAJnbYQkgpD/46rwx8QA7NMeCv BkSh18bm3TCx2GCDrQAzobP2tQAyX0Tee3ssMhAP+31jH8VovZPfQ6A3OKzbTX3V5HbJ wEjLX0O/kzrZAYIfhOE8kfAuraypj6SPxgI8ejIIOBdkT4RVdWAIVBuz7MV1u8P3J7Bx U5DA== X-Gm-Message-State: AOJu0Yz9c2L7oiq1pKPlrEj0w1dMu9dxOA6XO1I8/2Z0pXb0AtjUuwXf x2sZnXwjcc33EOosDrtCV4ZwagkbBMFwr2IGnKHZLLORNMn4f0YU+QptwQqGdSQ= X-Google-Smtp-Source: AGHT+IHD3qlV4q6X6+1Ie13maCT6VtPeicTEMxoOa/3FI1B1+FBMEfaWFoUYWFohwrjyI2qucA3rPQ== X-Received: by 2002:a2e:a988:0:b0:2ef:2df7:3d9a with SMTP id 38308e7fff4ca-2f3be578565mr58925841fa.9.1724013098796; Sun, 18 Aug 2024 13:31:38 -0700 (PDT) Received: from localhost.localdomain ([5.188.167.245]) by smtp.googlemail.com with ESMTPSA id 38308e7fff4ca-2f3b746cd4bsm13023451fa.11.2024.08.18.13.31.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Aug 2024 13:31:38 -0700 (PDT) From: Sergey Matyukevich To: buildroot@buildroot.org Date: Sun, 18 Aug 2024 23:31:29 +0300 Message-ID: <20240818203134.1512793-2-geomatsi@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240818203134.1512793-1-geomatsi@gmail.com> References: <20240818203134.1512793-1-geomatsi@gmail.com> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1724013099; x=1724617899; darn=buildroot.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Mhx6606pJO8n8FmTcH/7+Os9zHkguXL1fswNWz91vf0=; b=PWitSMnzNYjv7fIZBeJrpFQGF7aHKbup2274gMr1IVch1bq30bZ+f0IH00uABqccui d0ZMQOn2htb/6KqB8ugtey27E/3iRQCSCrOybCFF64FFXxdTy/kXKty833h0gm6xNJoU U/zLIcFetZnWjY5DzwwV0/B9eUChpfWzFK4M33pzZZjA+ejhZ1t0+6VYHimTWvge291P +XupY7B4e//1XkdR8Kuns+WrNWq/SteWBCHgbSI0bMzzaRKcnjfJxVB4e3p1Cj5rNEmT FK3tJAm7Cdg4FtPlV6AVNy9RG8tdHp3dTCRjoGkNn/w+CiN4y9FNSxq3Efz35lSWmDIU LAEg== X-Mailman-Original-Authentication-Results: smtp3.osuosl.org; dmarc=pass (p=none dis=none) header.from=gmail.com X-Mailman-Original-Authentication-Results: smtp3.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=PWitSMnz Subject: [Buildroot] [PATCH 1/2] package/wpa_supplicant: wired driver needs headers >= 5.7 X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sergey Matyukevich Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" In wpa_supplicant v2.11 macsec support in wired driver requires enum 'macsec_offload' if libnl version is >= v3.6, see the commit: - https://w1.fi/cgit/hostap/commit/?id=40c139664439b2576e1506fbca14a7b79425a9dd Buildroot provides libnl version v3.9.0, so enum 'macsec_offload' shall be available in order to successfully build wpa_supplicant wired driver with macsec support. However that enum has only been added to Linux header if_link.h since kernel v5.7, see commits: - https://github.com/torvalds/linux/commit/21114b7feec29e4425a3ac48a037569c016a46c8 - https://github.com/torvalds/linux/commit/76564261a7db80c5f5c624e0122a28787f266bdf That is why we have to tighten restriction on Linux headers for wired driver from v4.6 to v5.7. Fixes: - http://autobuild.buildroot.net/results/b59d5bc5bd17683a3a1e3577c40c802e81911f84/ Signed-off-by: Sergey Matyukevich --- package/wpa_supplicant/Config.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/wpa_supplicant/Config.in b/package/wpa_supplicant/Config.in index 92953f69f0..e013f5a9c1 100644 --- a/package/wpa_supplicant/Config.in +++ b/package/wpa_supplicant/Config.in @@ -42,7 +42,7 @@ config BR2_PACKAGE_WPA_SUPPLICANT_WEXT config BR2_PACKAGE_WPA_SUPPLICANT_WIRED bool "Enable wired support" depends on BR2_TOOLCHAIN_HAS_THREADS # libnl - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_6 + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_7 select BR2_PACKAGE_LIBNL select BR2_PACKAGE_WPA_SUPPLICANT_EAP help @@ -50,8 +50,8 @@ config BR2_PACKAGE_WPA_SUPPLICANT_WIRED supplicant can be used with Ethernet. This also enables support for MACSEC. -comment "wired macsec support needs a toolchain w/ headers >= 4.6" - depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_6 +comment "wired macsec support needs a toolchain w/ headers >= 5.7" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_7 comment "wired support needs a toolchain w/ threads" depends on !BR2_TOOLCHAIN_HAS_THREADS From patchwork Sun Aug 18 20:31:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Matyukevich X-Patchwork-Id: 1973606 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (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 4Wn6pL0RBsz1yfR for ; Mon, 19 Aug 2024 06:31:54 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id AD61E40247; Sun, 18 Aug 2024 20:31:51 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id tJt3rDpCB2oa; Sun, 18 Aug 2024 20:31:50 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 402B340215 Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 402B340215; Sun, 18 Aug 2024 20:31:50 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id DD2F91BF41C for ; Sun, 18 Aug 2024 20:31:45 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id CA5BA400BF for ; Sun, 18 Aug 2024 20:31:45 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id 8foMblMPiZmw for ; Sun, 18 Aug 2024 20:31:43 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::22d; helo=mail-lj1-x22d.google.com; envelope-from=geomatsi@gmail.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp2.osuosl.org F2CBD40021 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org F2CBD40021 Received: from mail-lj1-x22d.google.com (mail-lj1-x22d.google.com [IPv6:2a00:1450:4864:20::22d]) by smtp2.osuosl.org (Postfix) with ESMTPS id F2CBD40021 for ; Sun, 18 Aug 2024 20:31:42 +0000 (UTC) Received: by mail-lj1-x22d.google.com with SMTP id 38308e7fff4ca-2ef2c56d9dcso44801251fa.2 for ; Sun, 18 Aug 2024 13:31:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724013100; x=1724617900; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=n4qGjJlgwr9zjFDNM9MB+6BON+ZN0YaHZddD9tryitw=; b=chWFCEi19nl2vjTXWEmsarjcq71HTEWAx4XUKf9428rvKzSiqoMgs9CHy3eaW6sF1Q e3U+UCl0PxX4PxL5S6MZdxD8ot+ZVQkANdQVmzRVXgvurhyZHRkP+J//5BFtxXDUWmc0 JA0Bsk/CAGHFELPhq8J0jZwWijT7xHp19TrDWqZhg6xlBZQli4XigzcRpNFrbP7YOm1l 63RyN3f3fSRGD+5LEbJYJcCnJbcQFntzoClLRqdbir1OlmAQXIMUlRzHg7BVXJyz8Nrc 5lhvbokQnyJQvgON1Q112BM204HQ9JTToyS7Dw2eNGEZZRv8PzS/QqFce4uAsIPJ1MXN ExaQ== X-Gm-Message-State: AOJu0YwDjzejH0YwQ/vmzTayY4JjKunwgKD8Z8+e9m5Thlu2yQQxbzru b2IrM2ad3O10WhMQBhjKITeZh0k6UgkH2OP42IoCtlTOFRlMGKrLrSsH5bm/YR4= X-Google-Smtp-Source: AGHT+IFTmFDHfxjUI2VVLZ7Acf6+K2m4ySbEEv67I8UH0kiv33nD2BB53XIINHAlDV/mqvRIQMAgNw== X-Received: by 2002:a2e:7e12:0:b0:2ef:205d:4847 with SMTP id 38308e7fff4ca-2f3be60d6f3mr56755301fa.46.1724013099831; Sun, 18 Aug 2024 13:31:39 -0700 (PDT) Received: from localhost.localdomain ([5.188.167.245]) by smtp.googlemail.com with ESMTPSA id 38308e7fff4ca-2f3b746cd4bsm13023451fa.11.2024.08.18.13.31.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Aug 2024 13:31:39 -0700 (PDT) From: Sergey Matyukevich To: buildroot@buildroot.org Date: Sun, 18 Aug 2024 23:31:30 +0300 Message-ID: <20240818203134.1512793-3-geomatsi@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240818203134.1512793-1-geomatsi@gmail.com> References: <20240818203134.1512793-1-geomatsi@gmail.com> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1724013100; x=1724617900; darn=buildroot.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=n4qGjJlgwr9zjFDNM9MB+6BON+ZN0YaHZddD9tryitw=; b=Lx0UkDQCiS35eufGmzjB72ERR3Na2LTiDDGkEs6ntNkzgbbvoUcy1as+wP7seN+i9h oyynkgbwQN1TgmQoRs2BowlT0VsDMZNOMBsJcz4bjAOehaUFpRllT3cDP5gCJEF6Vu1e A4/nIunzu4fj6C6nezvQE5H17yJGQNZ+ZTKR/4sPMoR6J2K5ujZoTpRmuvMZ41q43qyi NDE2ONimVtFqIrM4ut36pvPag2HP9dO/GtP2Hmoc3jgm2pkfdgemRytjnLQ6957ohjBe tPLKZvaWXw5V7m64h+RnvWXpABE1nPDePj3LhnpRr5uC+kFvBcqKUOMdWjT/sWrvKwEB YFtA== X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dmarc=pass (p=none dis=none) header.from=gmail.com X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dkim=pass (2048-bit key, unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=Lx0UkDQC Subject: [Buildroot] [PATCH 2/2] package/wpa_supplicant: revert upstream commit to fix brcmfmac X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sergey Matyukevich Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Revert the upstream wpa_supplicant commit 41638606054 ("Mark authorization completed on driver indication during 4-way HS offload"). That commit breaks WPA2-PSK and WPA3-SAE for brcfmac driver in upstream Linux kernels. For details refer to the hostapd mailing list discussion and redhat bugzilla: - http://lists.infradead.org/pipermail/hostap/2024-August/042893.html - https://bugzilla.redhat.com/show_bug.cgi?id=2302577 Alternative option would be to disable offload in brcmfmac driver adding "brcmfmac.feature_disable=0x82000" to Linux command line. Final decision is not yet agreed upon on the hostapd mailing list, but reporter and maintainer are inclined to revert the patch. So this change adds revert to Buildroot to improve user experience for such boards as Orange Pi Zero Plus2, BananaPro, and others. Later on the patch will be updated according to hostapd upstream changes. Signed-off-by: Sergey Matyukevich --- ...orization-completed-on-driver-indica.patch | 55 +++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 package/wpa_supplicant/0001-Revert-Mark-authorization-completed-on-driver-indica.patch diff --git a/package/wpa_supplicant/0001-Revert-Mark-authorization-completed-on-driver-indica.patch b/package/wpa_supplicant/0001-Revert-Mark-authorization-completed-on-driver-indica.patch new file mode 100644 index 0000000000..89954eb7c5 --- /dev/null +++ b/package/wpa_supplicant/0001-Revert-Mark-authorization-completed-on-driver-indica.patch @@ -0,0 +1,55 @@ +From 170d8a433308ee39f87af94acaef461f8e80b67b Mon Sep 17 00:00:00 2001 +From: Janne Grunau +Date: Sun, 4 Aug 2024 13:24:42 +0200 +Subject: [PATCH] Revert "Mark authorization completed on driver indication during 4-way HS offload" + +This reverts commit 41638606054a09867fe3f9a2b5523aa4678cbfa5. + +Signed-off-by: Janne Grunau +Signed-off-by: Sergey Matyukevich + +Upstream: not yet sent, ongoing discussion http://lists.infradead.org/pipermail/hostap/2024-August/042893.html + +--- + wpa_supplicant/events.c | 25 ++++++++----------------- + 1 file changed, 8 insertions(+), 17 deletions(-) + +diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c +index 49917f7aa..bbb3a3eda 100644 +--- a/wpa_supplicant/events.c ++++ b/wpa_supplicant/events.c +@@ -4327,23 +4327,14 @@ static void wpa_supplicant_event_assoc(struct wpa_supplicant *wpa_s, + eapol_sm_notify_eap_success(wpa_s->eapol, true); + } else if ((wpa_s->drv_flags & WPA_DRIVER_FLAGS_4WAY_HANDSHAKE_PSK) && + wpa_key_mgmt_wpa_psk(wpa_s->key_mgmt)) { +- if (already_authorized) { +- /* +- * We are done; the driver will take care of RSN 4-way +- * handshake. +- */ +- wpa_supplicant_cancel_auth_timeout(wpa_s); +- wpa_supplicant_set_state(wpa_s, WPA_COMPLETED); +- eapol_sm_notify_portValid(wpa_s->eapol, true); +- eapol_sm_notify_eap_success(wpa_s->eapol, true); +- } else { +- /* Update port, WPA_COMPLETED state from the +- * EVENT_PORT_AUTHORIZED handler when the driver is done +- * with the 4-way handshake. +- */ +- wpa_msg(wpa_s, MSG_DEBUG, +- "ASSOC INFO: wait for driver port authorized indication"); +- } ++ /* ++ * We are done; the driver will take care of RSN 4-way ++ * handshake. ++ */ ++ wpa_supplicant_cancel_auth_timeout(wpa_s); ++ wpa_supplicant_set_state(wpa_s, WPA_COMPLETED); ++ eapol_sm_notify_portValid(wpa_s->eapol, true); ++ eapol_sm_notify_eap_success(wpa_s->eapol, true); + } else if ((wpa_s->drv_flags & WPA_DRIVER_FLAGS_4WAY_HANDSHAKE_8021X) && + wpa_key_mgmt_wpa_ieee8021x(wpa_s->key_mgmt)) { + /* +-- +2.45.2 +