From patchwork Thu Nov 9 12:30:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinayak Yadawad X-Patchwork-Id: 13451019 X-Patchwork-Delegate: johannes@sipsolutions.net Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D5C61C4332F for ; Thu, 9 Nov 2023 12:30:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230229AbjKIMay (ORCPT ); Thu, 9 Nov 2023 07:30:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59382 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229898AbjKIMax (ORCPT ); Thu, 9 Nov 2023 07:30:53 -0500 Received: from mail-pj1-x102d.google.com (mail-pj1-x102d.google.com [IPv6:2607:f8b0:4864:20::102d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4B5C1171B for ; Thu, 9 Nov 2023 04:30:51 -0800 (PST) Received: by mail-pj1-x102d.google.com with SMTP id 98e67ed59e1d1-2800bdf888dso722979a91.1 for ; Thu, 09 Nov 2023 04:30:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1699533051; x=1700137851; darn=vger.kernel.org; h=mime-version:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=oxAgZYdp8RG3v9tRNv6AY2Z6X01jUs+5YmSczuoHJuI=; b=EmnjJ2JG1J9QDIVz5+0abScDAwIWRJgw9najTmBrqSWszhqMwtwUbo7Oe5REDlHpJz WB3xjbEr5FiTTw2mWCgTc535O6jRRRTjg3yN7ltqWOBoee19pBhUTIRtlp3C+Mmntxam wgsuoYDrKXNfQDnih+B2npBto7xD0LXHB/jqY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699533051; x=1700137851; h=mime-version:message-id:date:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=oxAgZYdp8RG3v9tRNv6AY2Z6X01jUs+5YmSczuoHJuI=; b=kP4RY1mO8w6dY1JWzmN4VldraQEUvr7/QWgT+8guQheOobZePpdmz47XUqaBIy1P9f iQfzUrzMyI/lLWv1rStG1FaRsFQ7GF8XVGWYJi9xvS49Jo+5SJnb9dRVwp5couNJYEBb 65s+Ra4HqlYewojw4hKZGYsBLeGdiH9niiqlurG5T0IbIj8n9axjoM7sgNRMtufcDc6v l0rgYOhOgIQjpwlrBCDh/l/o2btZZxsqxfaxIipoluX2eYVjsk744rbMUhzw6H8SBkBM v8cqN39nZ+X3PKHP58kBklDaWmRQXk/JaxKf8olRkch+Crrdv6rTZVxwiHgpiL/a6SoA Y5/g== X-Gm-Message-State: AOJu0YxMvA0X/AEGP3gO9UDjE44LsEa3zgswTNd6YhzJYyzHXo3iUe13 oPil+Q4/77fPiELH82ByRiECQWA54OjFZDwSN8Q= X-Google-Smtp-Source: AGHT+IEfXXdtQF1AMGCALmIiLpyNPrVbbYLvHh9urjo3PeguYiMfoD2/SwFoiJ+h5G6lS0jg0JbYPA== X-Received: by 2002:a17:90a:8a8f:b0:280:23e4:4326 with SMTP id x15-20020a17090a8a8f00b0028023e44326mr2243099pjn.14.1699533050513; Thu, 09 Nov 2023 04:30:50 -0800 (PST) Received: from ibnvda0196.ibn.broadcom.net ([192.19.252.250]) by smtp.gmail.com with ESMTPSA id pv6-20020a17090b3c8600b00280976d4ce3sm1219639pjb.37.2023.11.09.04.30.48 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 09 Nov 2023 04:30:49 -0800 (PST) From: Vinayak Yadawad To: johannes@sipsolutions.net Cc: linux-wireless@vger.kernel.org, jithu.jance@broadcom.com, Vinayak Yadawad Subject: [PATCH v3 1/1] wifi: nl80211: Extend del pmksa support for SAE and OWE security Date: Thu, 9 Nov 2023 18:00:41 +0530 Message-Id: X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Current handling of del pmksa with SSID is limited to FILS security. In the current change the del pmksa support is extended to SAE/OWE security offloads as well. For OWE/SAE offloads, the PMK is generated and cached at driver/FW, so user app needs the capability to request cache deletion based on SSID for drivers supporting SAE/OWE offload. Signed-off-by: Vinayak Yadawad --- v1->v2: Addressed review comments for indentation v2->v3: Addressed review comments for version update in header --- net/wireless/nl80211.c | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 569234bc2be6..8dc1c800f171 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -12183,24 +12183,37 @@ static int nl80211_setdel_pmksa(struct sk_buff *skb, struct genl_info *info) memset(&pmksa, 0, sizeof(struct cfg80211_pmksa)); - if (!info->attrs[NL80211_ATTR_PMKID]) + if ((info->genlhdr->cmd == NL80211_CMD_SET_PMKSA) && + (!info->attrs[NL80211_ATTR_PMKID])) return -EINVAL; - pmksa.pmkid = nla_data(info->attrs[NL80211_ATTR_PMKID]); + if (info->attrs[NL80211_ATTR_PMKID]) + pmksa.pmkid = nla_data(info->attrs[NL80211_ATTR_PMKID]); if (info->attrs[NL80211_ATTR_MAC]) { pmksa.bssid = nla_data(info->attrs[NL80211_ATTR_MAC]); - } else if (info->attrs[NL80211_ATTR_SSID] && - info->attrs[NL80211_ATTR_FILS_CACHE_ID] && - (info->genlhdr->cmd == NL80211_CMD_DEL_PMKSA || + } else if (info->attrs[NL80211_ATTR_SSID]) { + /* SSID based pmksa flush suppported only for FILS, + * OWE/SAE OFFLOAD cases + */ + if (info->attrs[NL80211_ATTR_FILS_CACHE_ID] && + (info->genlhdr->cmd == NL80211_CMD_DEL_PMKSA || info->attrs[NL80211_ATTR_PMK])) { + pmksa.cache_id = + nla_data(info->attrs[NL80211_ATTR_FILS_CACHE_ID]); + } else if ((info->genlhdr->cmd == NL80211_CMD_DEL_PMKSA) && + (!wiphy_ext_feature_isset( + &rdev->wiphy, NL80211_EXT_FEATURE_SAE_OFFLOAD) && + (!wiphy_ext_feature_isset( + &rdev->wiphy,NL80211_EXT_FEATURE_OWE_OFFLOAD)))){ + return -EINVAL; + } pmksa.ssid = nla_data(info->attrs[NL80211_ATTR_SSID]); pmksa.ssid_len = nla_len(info->attrs[NL80211_ATTR_SSID]); - pmksa.cache_id = - nla_data(info->attrs[NL80211_ATTR_FILS_CACHE_ID]); } else { return -EINVAL; } + if (info->attrs[NL80211_ATTR_PMK]) { pmksa.pmk = nla_data(info->attrs[NL80211_ATTR_PMK]); pmksa.pmk_len = nla_len(info->attrs[NL80211_ATTR_PMK]);