From patchwork Mon Aug 5 14:07:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denis Kenzior X-Patchwork-Id: 13753652 Received: from mail-oi1-f171.google.com (mail-oi1-f171.google.com [209.85.167.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C628917C64 for ; Mon, 5 Aug 2024 14:07:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722866846; cv=none; b=cra6VPJWLDQ4BvXJ62NoE1HVbnqQubTZ1wSWDE75SIT/zjIjGT5DxI/4MLNZtNFFjFVZeQXapXmnCdDnqLxdUrQN7v3bOOgBFjoq+D7X3pql53oeldEkPR8IbXV7ZoUfFtcIL73v5pNuoaPQTIUjFGoE4jHcH8/91BwQ96T+Hs8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722866846; c=relaxed/simple; bh=TnJhlZSQZlCY+Nb7XxT0I3c6X9S6tgop07v2aJ5bqcY=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=rZe87HaISCf2sAlheNvplRB0AQJ/TJ3O0pW3mOlaon5/MtXMJ9HAxE7YnHQ0nYIBTvBTlY/PnDz55HKeLQtspEFZpYNO2U7vOZ0RZJEarhUlwTUWGLUd8sA/j6xO3ltCpcsI6t3aSB3dWkyGL2BjKL56OnCUTLpKrlyY2DSsDHw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=a3/VXJh8; arc=none smtp.client-ip=209.85.167.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="a3/VXJh8" Received: by mail-oi1-f171.google.com with SMTP id 5614622812f47-3db22c02a42so6617804b6e.3 for ; Mon, 05 Aug 2024 07:07:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1722866843; x=1723471643; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=rfFQn81mZNNz2E0CwmNrnW9XEkdWldOBKCwP10Xe/Ac=; b=a3/VXJh8TKH0HcPfOX6ZZlbP3frevJJgO4DaMAJO9MUwHOhb6p8nOeBTvTNAVDRVgk sgyWnfIH4/beT0JwEgJHtsmOIBhBG0G2GQ/+cDfoJ1wBwRhayDgegpXg7tuNkCKxDyeb KFmmEHJmVVd6+P+aH8Fo6bodO6a+vSHSQckwcyb+Ep/ebHwR/FcurkeDZLycHulItc4D ynLqcScWmQO2U5znTlvrsmKErqYQmT42h9MVeAXmfbaYuI8kCT9t2YfCChKAuwjnuY0L TUjV7DxZjOFHXgAObwxd3fg5zY5MpkUCQSLWpd19BTG0GR/zOwAjSHDznKXkRmiWHpka OGng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722866843; x=1723471643; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=rfFQn81mZNNz2E0CwmNrnW9XEkdWldOBKCwP10Xe/Ac=; b=XIOr+6xFP20u6X3Yg9cMF9CzseULkIxzSgG65TNxsa+g85Xt6d5+AU30OWBjfC86QM DJvGSFXi1cj9uUj7yIZK8jpct4p2OKq8yOE/Ir0OGbeAOS/ZZerui9+57eHa7QEYWce7 USb5XIMSu/lPbPP4WjxVDPqWXEwlUd2dAfjMGUf/JoelXuAGK6IP0sBelLn8tbiSiJVe xeRRSA8fAKyrKuRKcZMXsP/g221DTOFiVshjUypKIbYRbEqjeERk0Xn1AWpgtnomi+FG W16nOEgTTtPgwE7ST0s0EQhig2REz0H6MBj+cdMHp58a7lWUaSE9ufCKB8fBeQWQv8ct wVDA== X-Gm-Message-State: AOJu0YwAcOGRINJtMhzZAvS6qAX7HlBvzli/LC7UT6BEd7/S2FiNlADc K8brNVEavWgfD4cVR7Od6knDTwL6+a59B+iBajLTLrBrW5Ex+OQXfGu2xw== X-Google-Smtp-Source: AGHT+IEvFjRXPABHmBjBKNS+fzPaWjAjTh1hMpJ2Lb3thjfUwrcoCSxd0sGcMbU/DP61LJax0la/XA== X-Received: by 2002:a05:6808:1308:b0:3db:19b9:1e39 with SMTP id 5614622812f47-3db5583fd74mr12488891b6e.50.1722866843632; Mon, 05 Aug 2024 07:07:23 -0700 (PDT) Received: from archdev.attlocal.net (syn-070-114-247-242.res.spectrum.com. [70.114.247.242]) by smtp.gmail.com with ESMTPSA id 5614622812f47-3db56361a88sm2654172b6e.4.2024.08.05.07.07.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Aug 2024 07:07:23 -0700 (PDT) From: Denis Kenzior To: iwd@lists.linux.dev Cc: Denis Kenzior Subject: [PATCH 1/7] monitor: Decode RMNet Mux Identifier Date: Mon, 5 Aug 2024 09:07:08 -0500 Message-ID: <20240805140721.57518-1-denkenz@gmail.com> X-Mailer: git-send-email 2.45.2 Precedence: bulk X-Mailing-List: iwd@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 --- monitor/nlmon.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/monitor/nlmon.c b/monitor/nlmon.c index e5cd545173ce..941992595412 100644 --- a/monitor/nlmon.c +++ b/monitor/nlmon.c @@ -7597,8 +7597,15 @@ static void flags_str(const struct flag_names *table, pos += sprintf(str + pos, "]"); } +static struct attr_entry link_info_data_entry[] = { + { IFLA_RMNET_MUX_ID, "RMNet Mux Id", ATTR_U16 }, + { }, +}; + static struct attr_entry link_info_entry[] = { { IFLA_INFO_KIND, "Kind", ATTR_STRING }, + { IFLA_INFO_DATA, "Info Data", + ATTR_NESTED, { link_info_data_entry } }, { }, }; From patchwork Mon Aug 5 14:07:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denis Kenzior X-Patchwork-Id: 13753653 Received: from mail-oi1-f181.google.com (mail-oi1-f181.google.com [209.85.167.181]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7A8CF55894 for ; Mon, 5 Aug 2024 14:07:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722866846; cv=none; b=V/NqaE3Pxxt77PghfysgjVYWdfuolMsDZjQaDjxpvNPwDfknXsUBo17xMxEK6rBqm4QMOoUWPfhzLdf5Rt8tIRPrdoIi2JKjGoa59NCITmj+3ck7MzYsGV6i9gTZKowGZfQJf6TDQGJ8K9PUWbNrt0sTlbyt/csrbRTqBUN81mM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722866846; c=relaxed/simple; bh=JLQ+Pb/EmccRoKEoC56+wI4QY9Ds8GnYO9r6iLs9cB4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kuBwK+XRlnoET9xx+R7nw6cVn6oJtUiF8y2jI65WySzvKX9CRrwmQoUQqjKKUfurpdiJm52HYcSiTkBkyg545Thqn/1zG+fhWROkvI/abFL4VSoY1oJCkFec7HsmSdhGJuyJ0PlZNPK+IJYkUvB/5moWpob2kKXjI9bq4Ta17fE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=hnl63DSL; arc=none smtp.client-ip=209.85.167.181 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="hnl63DSL" Received: by mail-oi1-f181.google.com with SMTP id 5614622812f47-3db2315d7ceso6207404b6e.1 for ; Mon, 05 Aug 2024 07:07:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1722866844; x=1723471644; darn=lists.linux.dev; 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=Xx+XprITqFGTjtQ4SmUv/xE3MhlLmwzNRrABoCGND4k=; b=hnl63DSLv0cNtqKZKKXbRr1hRJFn4HvG4tl2nekAcS5b2vG/h9kX4W2j9dRGFpAdFn 4bsYrb8bFKgasQETxkZ/17hJFmuQS4pjz0ITMdb4tpXvkBX6YT2O5wyZNItvvovjph3R 6BIzE/eu8pwBmksHiN2cyO7Ss5iRULYlMRxhlt6yH5wT+ljPw0qG9QEPdhYeWi9VkIG4 Iso5ozxIFXVIKhv+s1lcpMW65ccpR5rCyg/96k2U/zyBZPdd1vW2NnnTjICOAniZrKSE UudRvH2OtuJ0Ky7coj3Qcg50MYN6q+yQfrS6fq8Tst+IHfGKgD4SKNa+aN7fjAECoBpF zTUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722866844; x=1723471644; 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=Xx+XprITqFGTjtQ4SmUv/xE3MhlLmwzNRrABoCGND4k=; b=vZpu73Sv+QWRYQ7HV+VRwZaanqHxYe+mHFbLrsslOp4jmEuVhBsZwEvhI/0slTrFzW jsFIxLpCxIL//nNwJpAX0Sh4IYQQCF5T4oroRpjnS+las5UbTFSsR+6jjn4wWq6FLXKz 6WfWQr4zSxzBWzEUYw/7nJ8S+lW2311Z4GbGs9KJH773K/3tGr0PWhrN4EPkAKMNeBZP qi7+xluTuCrfvjai8Oi2CS5v/l7lpJ1v/y3XOos7E2D9Wx9rniCfnXJm3zawcizOVdvS HEu5iHQ2XJa9FkQvkD2U0VJyocXbcQZ1utrOKAnKkZINuWaCbPi+ImQRuSY5HIb2Qxqo WELA== X-Gm-Message-State: AOJu0YyurO/XTLhCIWtru9mHq9QdksQd7SlWQt6dp58uoTeyqOrrAwVl FlNhDXoF+c/YLZuOtlFsNLXTs44C//M+Zi9mriGBa9n3WjQmwmS9LSYo/w== X-Google-Smtp-Source: AGHT+IHUtwk6vcgM4Jy/5QSt2kspsLsO43Zp06KoGwL3jjvJow6S5bNtM8me4UmyqTOr4zJhCrFm1A== X-Received: by 2002:a05:6808:1206:b0:3da:4c28:6697 with SMTP id 5614622812f47-3db5582e23dmr14935889b6e.38.1722866844389; Mon, 05 Aug 2024 07:07:24 -0700 (PDT) Received: from archdev.attlocal.net (syn-070-114-247-242.res.spectrum.com. [70.114.247.242]) by smtp.gmail.com with ESMTPSA id 5614622812f47-3db56361a88sm2654172b6e.4.2024.08.05.07.07.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Aug 2024 07:07:23 -0700 (PDT) From: Denis Kenzior To: iwd@lists.linux.dev Cc: Denis Kenzior Subject: [PATCH 2/7] monitor: Mask flags from attribute identifier Date: Mon, 5 Aug 2024 09:07:09 -0500 Message-ID: <20240805140721.57518-2-denkenz@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240805140721.57518-1-denkenz@gmail.com> References: <20240805140721.57518-1-denkenz@gmail.com> Precedence: bulk X-Mailing-List: iwd@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Certain flags (for example, NLA_F_NESTED) are ORed with the netlink attribute type identifier prior to being sent on the wire. Such flags need to be masked off and not taken into consideration when attribute type is being compared against known values. --- monitor/nlmon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/monitor/nlmon.c b/monitor/nlmon.c index 941992595412..214246ea72c2 100644 --- a/monitor/nlmon.c +++ b/monitor/nlmon.c @@ -7762,7 +7762,7 @@ static void print_rtnl_attributes(int indent, const struct attr_entry *table, return; for (attr = rt_attr; RTA_OK(attr, len); attr = RTA_NEXT(attr, len)) { - uint16_t rta_type = attr->rta_type; + uint16_t rta_type = attr->rta_type & NLA_TYPE_MASK; enum attr_type type = ATTR_UNSPEC; attr_func_t function; const struct attr_entry *nested; From patchwork Mon Aug 5 14:07:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denis Kenzior X-Patchwork-Id: 13753654 Received: from mail-oi1-f175.google.com (mail-oi1-f175.google.com [209.85.167.175]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7E8D717C64 for ; Mon, 5 Aug 2024 14:07:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722866847; cv=none; b=DS9FFh/BrhjNpRMu7ix5QjoUvInX/jknDlPvxR2B/azrbX/CW38OGdKnGkFY/NXDteG9Xv7wIW2BOkEcB4dLXmTsCel0Ty3xnY3bQQ/T2W2wZMawcAtgmFCGdZQW0QE3yBdGxyN756cyE9n5L69JeKZ5QMgPmT8Y60CGbJHrYYk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722866847; c=relaxed/simple; bh=+yMGTPCSkOLc2FFzZmsCUHxyrmiaeuco4Ghi72cG+s4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=PCDL3YZ9yEd1nlaQ+3W5nBp7D7EtOfT14OnFUJXzAQaxQPysemA/R4j9dhF0JE7TGyTuU+EojnHfvm2db/GR30d7TzO5PI+lhOYwZQjgy5H80KGaNaz1sLHsh9rfA+F9OoVv1QQBToC8HLoDetOeBmRliUvrMI2heCrGwGoc8dk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=GIecTKZp; arc=none smtp.client-ip=209.85.167.175 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="GIecTKZp" Received: by mail-oi1-f175.google.com with SMTP id 5614622812f47-3db504ab5f3so2922859b6e.0 for ; Mon, 05 Aug 2024 07:07:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1722866845; x=1723471645; darn=lists.linux.dev; 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=idHjvPbdJCUT1qRDAOnY/1uva9G15W/NbgoaUGRZRng=; b=GIecTKZpKgYSBsZ4crgvi0F/cx4Y8VXyUA+b9x1f4B4oG4jUXEDMFngRabizleQxyv Fht0eagnNS8iLa0qlnUp5bEfAvDd5G4QwXMy+fv2UOEz8o9ng5JBEYV95LQBnghXzjnB h/1Jzw6ymvSgidhm2Rri8XnwFMaCAQWZ+cqPDzEaWhpDh+R+ddCKvqoHV83nqIOLEEGy 6E7zrcWj/RFhrrd2Ujfw+/D6PWo1mtdK3H0lsc9vT/8E6BTgNnSRyOoZCUdUYFWkwBTE /fjjZXdD9FeRsTYbV8iho/SHxAKmXQ02IntgQvJCi1nDvXRZFU2Hn6sertFgOM7r/h/l m9bw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722866845; x=1723471645; 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=idHjvPbdJCUT1qRDAOnY/1uva9G15W/NbgoaUGRZRng=; b=qGOTcFAavBa+g7hSMz6jfZmeyVESamXVONDI0+20U2dvdolRPuogU08oQMqyVhRtBo XPwCqmb9AX8dveETuMpmInZaHglqRjtG5oSpQISsyy+NsfWAv53kdZsNEqylnL8gMHJC l658tWpFymJg6cqjWEnPeXP0KoL9jkCsAJXhpGcpp4UMDSnlCHqH8aAZ6/4BV2ZhWtOl Qqppbmjuprbz8tgtznkL9zu8Tp5uW3tuwPyCGsKgKDibR39AH5QdDC+B+vr/iNrVLLZm WY4PyIiSn/B344NsKlpqapwOAiLbeZ7P4cE2mtkSiGn/Y2XSGj6/g82QRJroXYcMvGxm nWvw== X-Gm-Message-State: AOJu0YxZWR8zC2N0PsliygoQ+4gMgzR5W1pmb2C/ctyWpDryAsnR0M4H WCq0R4Gt3JVQf1qQVPyTyEo2+oCQs0a98ncX76of9gevpcVrXJ7zrjVVRQ== X-Google-Smtp-Source: AGHT+IFwo330Y19anfNnLhk1qEZH+BJalgb3Youd630qMmHXytF4OCrEZ6EXj3zn96y8afKY2IOYnQ== X-Received: by 2002:a05:6808:2387:b0:3d9:e1d1:155c with SMTP id 5614622812f47-3db55832f34mr10165314b6e.35.1722866845585; Mon, 05 Aug 2024 07:07:25 -0700 (PDT) Received: from archdev.attlocal.net (syn-070-114-247-242.res.spectrum.com. [70.114.247.242]) by smtp.gmail.com with ESMTPSA id 5614622812f47-3db56361a88sm2654172b6e.4.2024.08.05.07.07.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Aug 2024 07:07:25 -0700 (PDT) From: Denis Kenzior To: iwd@lists.linux.dev Cc: Denis Kenzior Subject: [PATCH 3/7] wiphy: Fix use of wiphy_has_feature Date: Mon, 5 Aug 2024 09:07:10 -0500 Message-ID: <20240805140721.57518-3-denkenz@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240805140721.57518-1-denkenz@gmail.com> References: <20240805140721.57518-1-denkenz@gmail.com> Precedence: bulk X-Mailing-List: iwd@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Features with the _EXT_ in the name must be queried using the wiphy_has_ext_feature method. Fixes: bc7b12d1a4a7 ("wiphy: handle FILS AKMs") --- src/wiphy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/wiphy.c b/src/wiphy.c index fb36ebb2b3c6..6b755ff8201d 100644 --- a/src/wiphy.c +++ b/src/wiphy.c @@ -276,7 +276,7 @@ enum ie_rsn_akm_suite wiphy_select_akm(struct wiphy *wiphy, * for fast transitions. Otherwise use SHA256 version if present. */ if (security == SECURITY_8021X) { - if (wiphy_has_feature(wiphy, NL80211_EXT_FEATURE_FILS_STA) && + if (wiphy_has_ext_feature(wiphy, NL80211_EXT_FEATURE_FILS_STA) && fils_capable_hint) { if ((info->akm_suites & IE_RSN_AKM_SUITE_FT_OVER_FILS_SHA384) && From patchwork Mon Aug 5 14:07:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denis Kenzior X-Patchwork-Id: 13753655 Received: from mail-oi1-f178.google.com (mail-oi1-f178.google.com [209.85.167.178]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9F35855894 for ; Mon, 5 Aug 2024 14:07:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722866849; cv=none; b=GfpaE3bLheaQy55WprgPa4axnnqLZNuJunE03EtJT1JmiV8aBdHXIEMW4lKL7U5EJyyGzteBANilCTjTWdyeulDNOudgjHeBIS/LteVKb5FxbadfN6IIkdbMZkcq4D8WyBH0pxqEFQaGg9Aqz03gx2DS7zVcmP3ZhDBE7qucmWI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722866849; c=relaxed/simple; bh=hSpK+Y7tLI/tno85wYSWEUNuO3TrOl8pVIG1mmp7zLY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=q6CSoH5choqZ3zUzZh8s2Byzj3kwVdbZ+9Kx5LzVBgmwn968wk3Fvr8guVIO67lBTa09SaN9oYl7wDMrcyh5fOHB2ypOArmkOuPEYwe07Y1h8ElvUafOsxSKXqk9dECjJqJSAgixBlmBS81pe6DpL9BQWeeeDlq/PBToXm4WS/g= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=GCtu+sFs; arc=none smtp.client-ip=209.85.167.178 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="GCtu+sFs" Received: by mail-oi1-f178.google.com with SMTP id 5614622812f47-3db16b2c1d2so7587290b6e.2 for ; Mon, 05 Aug 2024 07:07:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1722866846; x=1723471646; darn=lists.linux.dev; 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=PNLTTywNlsr5MeFF1RgS9BCsopTj9oo062z1H32v7zw=; b=GCtu+sFs18LnA+u7ADOpITnF+lulufRR1QiMxhqufbRvXxVZ2cjYyrIdaxByCdRHYK alvfMHZkAQvKqb/rTY2wlu/hwAwi0Xtt1aW9LmdX1A3NhoA65XVYGoQaDqr1Hze5SNby KBNa+hQcWAeY8jGUw+TCC5JX9q0Uy+3SLM/noU3Tq9F9339sUlb6RbW8kAUEOvA2MgM/ RhmKKsDcvvsyEQI0k+YAa9dqgvPcZTS5A2q0VhXY8xpgA4medoIL9LsFS6Lqw4OFj+MV 8y67aj17AADEeIqrMaSY6rqWKa3o2/iyT7AwAT42fIzspXAF9Apl6E4/LmvcLN5qECM8 qrLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722866846; x=1723471646; 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=PNLTTywNlsr5MeFF1RgS9BCsopTj9oo062z1H32v7zw=; b=lzjafWvRrBjEF2aHQC8jlUTh+TGnDjAItkoC5NJcWUyKc41u98TX5adb83tnzbi6g4 wPlewkcjY42NMXJ0NHqs9ZkqRg8Fu8fht6UhwrPPzXZich4SYHoyP7+5Tez1LNqhEnbP 1nGf30x9JF2hyGyvKGwNR0k3hAfIX+2w0u6zTLlpwYwINvRInTeJXHbq10TytldqPNNe XX0WFxYc5cZTgftoATVQ67j1I25X+PEtmKC2LsQMkMoe+iBSfjjrK3wif/zKSp92iqGq JAKoKwGZw13qSA6n6VW9uhPHaPZmE+QjpfCKNRSPtpCNyiXrBNT4A9qna6Gs/YIbvyI5 RNvg== X-Gm-Message-State: AOJu0Yx+lvtIHKzyOJ6q9jlV01voXhC/tkOxfHx+f5Hs0hj8C9Um0eVp enk7T9zDoqJ2J3sH42xcIIx4LHjnVGETfkJSJG+ybXP1Do//3AzIsyNt3Q== X-Google-Smtp-Source: AGHT+IFVpep5finbrgqRspubdR+5EsVFaz4EmwL9mmtCFp8Z1lSziX9nDgobgS308dhi4xxqIkgl4g== X-Received: by 2002:a05:6808:d48:b0:3db:2865:ca41 with SMTP id 5614622812f47-3db5583cfbamr16514630b6e.46.1722866846521; Mon, 05 Aug 2024 07:07:26 -0700 (PDT) Received: from archdev.attlocal.net (syn-070-114-247-242.res.spectrum.com. [70.114.247.242]) by smtp.gmail.com with ESMTPSA id 5614622812f47-3db56361a88sm2654172b6e.4.2024.08.05.07.07.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Aug 2024 07:07:26 -0700 (PDT) From: Denis Kenzior To: iwd@lists.linux.dev Cc: Denis Kenzior Subject: [PATCH 4/7] ie: Add IE_AKM_IS_OWE Date: Mon, 5 Aug 2024 09:07:11 -0500 Message-ID: <20240805140721.57518-4-denkenz@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240805140721.57518-1-denkenz@gmail.com> References: <20240805140721.57518-1-denkenz@gmail.com> Precedence: bulk X-Mailing-List: iwd@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Similarly to IE_AKM_IS_SAE, IE_AKM_IS_FILS, etc --- src/ie.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/ie.h b/src/ie.h index 024eacaa987d..82945de676a9 100644 --- a/src/ie.h +++ b/src/ie.h @@ -361,6 +361,11 @@ enum ie_rsn_akm_suite { IE_RSN_AKM_SUITE_OSEN = 0x40000, }; +static inline bool IE_AKM_IS_OWE(uint32_t akm) +{ + return akm & (IE_RSN_AKM_SUITE_OWE); +} + static inline bool IE_AKM_IS_SAE(uint32_t akm) { return akm & (IE_RSN_AKM_SUITE_SAE_SHA256 | From patchwork Mon Aug 5 14:07:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denis Kenzior X-Patchwork-Id: 13753656 Received: from mail-oi1-f178.google.com (mail-oi1-f178.google.com [209.85.167.178]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 95C0517C64 for ; Mon, 5 Aug 2024 14:07:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722866850; cv=none; b=Uy0H3Xhg0SCr2xNkevN3iAFYbDhhSBcRaFNvTb3igexx5oGdrUp/GKpkkN/Uy8rumMyIPLbHCqN6sJyDLDu7vCB8Vay4bp65gRJVidWEw9dOMrS2rtvLSvKHbj+tHFoHEZRNV/F/Bfh1v0VMYjN8AVPt98mGZMAeFFbk2Zdx5dc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722866850; c=relaxed/simple; bh=08NwWIRugipPWTC5orVbxFhQoTv/7mN/D42Srsxas7w=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IBEMqhYPjSHJCT3UCAZouBvH4mdqeidD5gkzhDK5qeCWYamUTaBDJxjK5jehUwFTfExofmdYktXWlAdBVBwzoEinmu0aqIWMnm7dcX2NTTbO725GTsrX1Y3aKLyAECHnHoSN8f1xSy08Z7dHR/DQZ5OTWpG7Degr0gaGCm8/hJk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=eyn2/V50; arc=none smtp.client-ip=209.85.167.178 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="eyn2/V50" Received: by mail-oi1-f178.google.com with SMTP id 5614622812f47-3db1eb76702so7047352b6e.0 for ; Mon, 05 Aug 2024 07:07:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1722866847; x=1723471647; darn=lists.linux.dev; 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=VYMeZRUnyBdT7UTunKDwAKh/1AFWOuXxNAZnCugPvbk=; b=eyn2/V50XJGKfDboKUuISHIfe/MMmHWPsKDzHXWDeyNotDD6X6pzIY9C1T9KNdahfY z+zcR4DPBfrP9MwDyt5coqMqzKM0lTBd83HOgEaEvZxIcki+3sZEN8qMHFm8KacIEj36 kBKbdf6FooucVA2xH528cx+X1WQF/9/w4J1k9x2PfOCfeFtYx86JxQ5+sHhcVb21wX30 tNr/OlGqBcgtW/rkRUjj8l8Wi53fr1+YARZGUafVPtomIHCkJkXtpscbOMbOyOuVgs6c u2aTPZ181MuTpbrZWVi+41EGRPKJYBMa0GCAiS+uky90Rti95OivBP0VD82u0vSU0etI dSmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722866847; x=1723471647; 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=VYMeZRUnyBdT7UTunKDwAKh/1AFWOuXxNAZnCugPvbk=; b=uQQGUon5YC45acIAWEy1a4W0sn8mDmauR+vhWy7E9hhiAiXH3+13uvKW6Kd1vIXpMs Xw5xTD28SCl1OOuG53JJ5Typ/9T9GFc3V9mSCXShHCzX/iLquhUq2nei0Jm4N0n4RLpo zy6xggFLyap555czqT1f29ufBInbkLM1P863cRDf4WxgVMtVKscrjLFEUJbUJqQwIQ4T 7TUNoJvzrKPdc2Mt6E+/gUKUnju9Z8sN5tkNrmpT6i6scV24gqRbcLKOqQLzZBZSmLCr 0Y8wtfTSK5k/H6wZ2bimisdzyvFyeRVNS2DqtTPnM94t1lHXlz6DyGsHjVFBzk9Eqk/x eGsQ== X-Gm-Message-State: AOJu0Yx5V+a+vgqxmotdyEMTyoZOjKiIVgz1VZBtJOdxL+Bk2ygzOuM5 q2WLIVCsDokgah7pk4VpgSFM2kUryNyXCkXF97jBc2pwepyD9gV/+aSbIw== X-Google-Smtp-Source: AGHT+IGJ6JF6iU++AlQ4oVZSQKQhGyNIWFc9TUf6gVftQOupIvQ6wPPK4vTds+YZf8tHHYDEYSgPqA== X-Received: by 2002:a05:6808:1801:b0:3da:a793:f0d4 with SMTP id 5614622812f47-3db557fdfe5mr15784369b6e.4.1722866847346; Mon, 05 Aug 2024 07:07:27 -0700 (PDT) Received: from archdev.attlocal.net (syn-070-114-247-242.res.spectrum.com. [70.114.247.242]) by smtp.gmail.com with ESMTPSA id 5614622812f47-3db56361a88sm2654172b6e.4.2024.08.05.07.07.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Aug 2024 07:07:27 -0700 (PDT) From: Denis Kenzior To: iwd@lists.linux.dev Cc: Denis Kenzior Subject: [PATCH 5/7] netdev: Create owe_sm for fullmac connections Date: Mon, 5 Aug 2024 09:07:12 -0500 Message-ID: <20240805140721.57518-5-denkenz@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240805140721.57518-1-denkenz@gmail.com> References: <20240805140721.57518-1-denkenz@gmail.com> Precedence: bulk X-Mailing-List: iwd@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Somehow this ability was lost in the refactoring. OWE was intended to be used on fullmac cards, but the state machine is only actually created if the connection type ends up being softmac. Fixes: 8b6ad5d3b9ec ("owe: netdev: refactor to remove OWE as an auth-proto") --- src/netdev.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/netdev.c b/src/netdev.c index e27a0019b7ea..50e60c5d0c98 100644 --- a/src/netdev.c +++ b/src/netdev.c @@ -3826,6 +3826,12 @@ static void netdev_connect_common(struct netdev *netdev, if (!is_rsn) goto build_cmd_connect; + /* For OWE, always use the CMD_CONNECT path */ + if (IE_AKM_IS_OWE(hs->akm_suite)) { + netdev->owe_sm = owe_sm_new(hs); + goto build_cmd_connect; + } + if (nhs->type != CONNECTION_TYPE_SOFTMAC) goto build_cmd_connect; @@ -3848,10 +3854,6 @@ static void netdev_connect_common(struct netdev *netdev, } break; - case IE_RSN_AKM_SUITE_OWE: - netdev->owe_sm = owe_sm_new(hs); - - goto build_cmd_connect; case IE_RSN_AKM_SUITE_FILS_SHA256: case IE_RSN_AKM_SUITE_FILS_SHA384: case IE_RSN_AKM_SUITE_FT_OVER_FILS_SHA256: From patchwork Mon Aug 5 14:07:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denis Kenzior X-Patchwork-Id: 13753657 Received: from mail-oi1-f172.google.com (mail-oi1-f172.google.com [209.85.167.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4904412D20D for ; Mon, 5 Aug 2024 14:07:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722866850; cv=none; b=F0uNRVh1RJMEsrfP/RD/1iKOB4AvkMPg9nDMDDtmy10tgsyGhSQNEl9fBTrOZBNr7YnpCjRG1j62Rp0oK6spwONmVOyvCrPS3TRKhDm7P4k5wvF/BSZMNDbIrwwiHupQNc2OlDvbiO2h4yE7zbn72kDVmitnQdX22ybsiay+sAQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722866850; c=relaxed/simple; bh=1s8rYlEXH7Np0CAvoKA/K/5YN+Flt9sbRiNHuQx66yw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XsmyoqwNG0v4YDevZ3G/mi5lVKvpIOczHZkTJinSdCIymoObVVfDeKAcZE/fKyf3iw20HRFXbNrOU1RWYhcF9fWxuKmmo3+MFcFr7I9CUqjQC4+Z25yj7knbEU+UdyeORYD6hx3jGn2lfbhc8Y6oZwQLDANGl03A2HPpffZoCOk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=jszCUR+V; arc=none smtp.client-ip=209.85.167.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="jszCUR+V" Received: by mail-oi1-f172.google.com with SMTP id 5614622812f47-3db23a608eeso7209026b6e.1 for ; Mon, 05 Aug 2024 07:07:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1722866848; x=1723471648; darn=lists.linux.dev; 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=j9nYFSEGZUkVCf0LfV3Xahsx5Cwrr7qB8L4Ir/oargY=; b=jszCUR+VlcDbuMw1O5079z0KmzZdTrWC0z7a1fABLGcbO/Rve5KAGImIe7cViI70MQ E5RV3FS6vHf59wlJeslI14ZDo65S6M1TcJ7czw52sjbhiqfHrapqwChs+RQUueo7ptRX KdGanC0981v5Tu9HyisBalfOZdVsT6L+jDt+ea1qqty8LPcTOL6OASux7gWqQPWkRo3T p0d2Dglf6X/wlMOTanLQzY7w2xzLvpqEyZNpp+itLVxDhYMRbvbake3YK6pxpj5y/vEk kKfbkVjS/pUm/m6kNWUOFbnXqsOErPPxAQe2gBvioo2qv/cFvySDpbP/s6IMD+APkw1O UrWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722866848; x=1723471648; 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=j9nYFSEGZUkVCf0LfV3Xahsx5Cwrr7qB8L4Ir/oargY=; b=aqAoxwUlaA2H0SDxLeSV6vwHU+LekQDzhSYhnIiQWQJSypqTdtDIvMVzk34dvJR3sO 0SEOJmTBsDnGjal9LApuE8IKNJod7N8VcKb6C3ZuQQoKzb5VpCGRHz5qnRk57FgG+mq8 6wXPXjYlRVkKEkPrE5x9rzpJz8Rkqn9aHpPd2OyoSV44KeDOg+NNbt+Pp/62cN4PsaI+ 9VfKFCJc2S8n/U5hSuQkNbTLu2e65RcGwtVhoMqIBCF5/q/0WDCy+tjBtep03jEDLo2I RsYR7/2PDZrJ3Yh1CCZp8544YLZOEmqkTKod6odunN914zxlp22c4dRuh71EjHHrJk7R YaAg== X-Gm-Message-State: AOJu0Yx5ejWQCIZb8kK7uSD+a7SaLUJaoCBU1VAo9bo//Ps5l04P04o7 a3Zzh4OSIutX3s5k2n7d7s4wGw/Fnc17D0DTzLQe46m0QUxFM6z9cehPDQ== X-Google-Smtp-Source: AGHT+IHGfExD1upbeNjBsjnKe2aZYZgN1MZU9wCqDL/amk0GE4DXewOtEfnIXnu/QOt32fvFT+lIkg== X-Received: by 2002:a05:6808:1919:b0:3db:27e6:8be5 with SMTP id 5614622812f47-3db55847b72mr16749973b6e.42.1722866848249; Mon, 05 Aug 2024 07:07:28 -0700 (PDT) Received: from archdev.attlocal.net (syn-070-114-247-242.res.spectrum.com. [70.114.247.242]) by smtp.gmail.com with ESMTPSA id 5614622812f47-3db56361a88sm2654172b6e.4.2024.08.05.07.07.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Aug 2024 07:07:27 -0700 (PDT) From: Denis Kenzior To: iwd@lists.linux.dev Cc: Denis Kenzior Subject: [PATCH 6/7] fils: Ensure capability checks are consistent Date: Mon, 5 Aug 2024 09:07:13 -0500 Message-ID: <20240805140721.57518-6-denkenz@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240805140721.57518-1-denkenz@gmail.com> References: <20240805140721.57518-1-denkenz@gmail.com> Precedence: bulk X-Mailing-List: iwd@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 iwd supports FILS only on softmac drivers. Ensure the capability check is consistent between wiphy and netdev, both the softmac and the relevant EXT_FEATURE bit must be checked. CMD_EXTERNAL_AUTH could potentially be used for FILS for FullMAC cards, but no hardware supporting this has been identified yet. --- src/netdev.c | 3 ++- src/wiphy.c | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/netdev.c b/src/netdev.c index 50e60c5d0c98..fb095fdca561 100644 --- a/src/netdev.c +++ b/src/netdev.c @@ -3776,7 +3776,8 @@ static int netdev_handshake_state_setup_connection_type( case IE_RSN_AKM_SUITE_FT_OVER_FILS_SHA256: case IE_RSN_AKM_SUITE_FT_OVER_FILS_SHA384: /* FILS has no offload in any upstream driver */ - if (softmac) + if (softmac && wiphy_has_ext_feature(wiphy, + NL80211_EXT_FEATURE_FILS_STA)) goto softmac; return -ENOTSUP; diff --git a/src/wiphy.c b/src/wiphy.c index 6b755ff8201d..13d498a5cd0c 100644 --- a/src/wiphy.c +++ b/src/wiphy.c @@ -277,6 +277,7 @@ enum ie_rsn_akm_suite wiphy_select_akm(struct wiphy *wiphy, */ if (security == SECURITY_8021X) { if (wiphy_has_ext_feature(wiphy, NL80211_EXT_FEATURE_FILS_STA) && + wiphy->support_cmds_auth_assoc && fils_capable_hint) { if ((info->akm_suites & IE_RSN_AKM_SUITE_FT_OVER_FILS_SHA384) && From patchwork Mon Aug 5 14:07:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denis Kenzior X-Patchwork-Id: 13753658 Received: from mail-oi1-f170.google.com (mail-oi1-f170.google.com [209.85.167.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5E0AF17C64 for ; Mon, 5 Aug 2024 14:07:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722866851; cv=none; b=Y+tBeU5y82SxfZ8ScGSdgGx4fTnTS6CNB1cU+eJXvJ60WBERZ/7NV1vDFrQl1PxNV4yCJZJg4Ju/2AeRDqrr6YEFZe/f66261C9YrBmpobP8RJ2puZ+lqCCQ6XBAOjR6KA4l2hCMnR/p6KMMvPXL8k5QWD96AGEQLswEi70KYKs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722866851; c=relaxed/simple; bh=W/rohdQsP4mnfhtpZXf+x07LZ5SCvwFToxTbKpiTwAc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=PDF6i9cDGdf7vVDsyZm7zj2l9nWD3HrWKzLSm5NmBaADGHWRVezI2driCbI4XAZgNG9CyGeE6xbpvR3cW1ZFKhVOuDA3ulMO/A2gFPPfCm9fYhBxaKcknerV4NjG6ZZFtvQ7+yVARvdvFTaTgHfBo7pRPVra2SazjdSeCHxqGJk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=kYWDBC8r; arc=none smtp.client-ip=209.85.167.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="kYWDBC8r" Received: by mail-oi1-f170.google.com with SMTP id 5614622812f47-3db1270da60so7436756b6e.2 for ; Mon, 05 Aug 2024 07:07:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1722866849; x=1723471649; darn=lists.linux.dev; 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=KDGPEknDCSEMiAEXT3w71++JkOVTA745cTtkDfXqG0Y=; b=kYWDBC8rZRGwugXnEwXmIJuk4gafFwK5IRjR2FBFtQy+BNy/oi/wfzkAt1h7QOhNp2 BZRaAF9M1K4Vu0D6D0unxSjBO4P7krm87R67NmtHND3sS9PFLUHG+DPMsRiDxRHImSHq cZ7JFjTDpmaPceGS5LYrR7+Kqhe/Z6iTffkfOT9hKc+jxUYMMjPp29IqD6CbX869e/fV m3ummUU6ara51CltR4QMIUtpTAK5F2oLS18ma/2cgkVd3HGnmqtUzm1YsLZeKYZbF7Of rvY5dLuaZd1IahF9HjQM+uFIMinCvIpT5Xbz8VtQLnr6Mti8Riz7DxKQYiEhKRZ+vmja OCjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722866849; x=1723471649; 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=KDGPEknDCSEMiAEXT3w71++JkOVTA745cTtkDfXqG0Y=; b=FtnhV9Qd/3YnHTcxH82MqFpKqBp8+vpUzm/v/AAtfRvlgCWFxl86Wl9vZCKy5GdWJt b+zV2e3DSzOmYOLdzwwfKxW0VXU7tyKmMooBjTlKChsys4QMjfITu/QxyAvUOHk9LNgs UkQ4MO13IFgSArW88NzzOIomJMhvma1MJ70MylNX+1Jf64+gKIbIvbY05OS7mNscWstm LDrb0D1Qy6aCvcFE3y81H/PUJ3XViiqVpqVB9HmGDj9dO6A3geWcifrr7sZJt9f2ITbb gIL1NK/DODSnjWB6fjt7KZ2LslJlUnJrglmXotWu8xYfN+RkueYP0olx1AKdoIEmHA85 uWfg== X-Gm-Message-State: AOJu0YyqM81ysDQ6wsuLglrkz2wevb2xyMJYSLkjC40rMWj/YrCqIutj h+iuXvD5GHS6fjR/F1Dmr+rUwp0xXA+AaZqUJRR5TmxgmXCWnAf/AoKtBQ== X-Google-Smtp-Source: AGHT+IFehnW90Tc/7AWbP5P6Eym9bypuFBPtW7s2dIx8a0P3PyYGD2ljNlR9A6i7lH7rbrSyfSH1Sw== X-Received: by 2002:a05:6808:1384:b0:3d9:3b17:f752 with SMTP id 5614622812f47-3db5581636emr16749201b6e.26.1722866849278; Mon, 05 Aug 2024 07:07:29 -0700 (PDT) Received: from archdev.attlocal.net (syn-070-114-247-242.res.spectrum.com. [70.114.247.242]) by smtp.gmail.com with ESMTPSA id 5614622812f47-3db56361a88sm2654172b6e.4.2024.08.05.07.07.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Aug 2024 07:07:28 -0700 (PDT) From: Denis Kenzior To: iwd@lists.linux.dev Cc: Denis Kenzior Subject: [PATCH 7/7] netdev: Simplify FILS handling in netdev_connect_common Date: Mon, 5 Aug 2024 09:07:14 -0500 Message-ID: <20240805140721.57518-7-denkenz@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240805140721.57518-1-denkenz@gmail.com> References: <20240805140721.57518-1-denkenz@gmail.com> Precedence: bulk X-Mailing-List: iwd@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 --- src/netdev.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/netdev.c b/src/netdev.c index fb095fdca561..494e46a59de2 100644 --- a/src/netdev.c +++ b/src/netdev.c @@ -3833,6 +3833,14 @@ static void netdev_connect_common(struct netdev *netdev, goto build_cmd_connect; } + if (IE_AKM_IS_FILS(hs->akm_suite)) { + netdev->ap = fils_sm_new(hs, netdev_fils_tx_authenticate, + netdev_fils_tx_associate, + netdev_get_oci, + netdev); + goto done; + } + if (nhs->type != CONNECTION_TYPE_SOFTMAC) goto build_cmd_connect; @@ -3855,15 +3863,6 @@ static void netdev_connect_common(struct netdev *netdev, } break; - case IE_RSN_AKM_SUITE_FILS_SHA256: - case IE_RSN_AKM_SUITE_FILS_SHA384: - case IE_RSN_AKM_SUITE_FT_OVER_FILS_SHA256: - case IE_RSN_AKM_SUITE_FT_OVER_FILS_SHA384: - netdev->ap = fils_sm_new(hs, netdev_fils_tx_authenticate, - netdev_fils_tx_associate, - netdev_get_oci, - netdev); - break; default: build_cmd_connect: cmd_connect = netdev_build_cmd_connect(netdev, hs, prev_bssid); @@ -3876,6 +3875,7 @@ build_cmd_connect: } } +done: netdev->connect_cmd = cmd_connect; netdev->event_filter = event_filter; netdev->connect_cb = cb;