From patchwork Mon Nov 13 10:42:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jithu Jance X-Patchwork-Id: 743740 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 44065C4167D for ; Mon, 13 Nov 2023 10:42:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229735AbjKMKmq (ORCPT ); Mon, 13 Nov 2023 05:42:46 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56022 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229459AbjKMKmo (ORCPT ); Mon, 13 Nov 2023 05:42:44 -0500 Received: from mail-pf1-x431.google.com (mail-pf1-x431.google.com [IPv6:2607:f8b0:4864:20::431]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6650A10CC for ; Mon, 13 Nov 2023 02:42:40 -0800 (PST) Received: by mail-pf1-x431.google.com with SMTP id d2e1a72fcca58-6bee11456baso3494729b3a.1 for ; Mon, 13 Nov 2023 02:42:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1699872160; x=1700476960; darn=vger.kernel.org; h=mime-version:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=JHdYdDanyZIvveGI8xtj7r7aRiOPWm86AD749MGMw3c=; b=QU3Dqg7flXwAMcVj3Q0IGELBv2w/zb5GHXQG2+7gPCoWjr3WChSqLzbgvCVxXs/ctM urNt78BoVzHEhW8ygbhq8eLPhcmS+vWYBA21P4gED3x7Ei7PyCrp4h6AtOkSX6geqwRi AXyheiqkniZpC0EsLTsHEpguHdI9dz4Ry04Ms= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699872160; x=1700476960; h=mime-version:message-id:date:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=JHdYdDanyZIvveGI8xtj7r7aRiOPWm86AD749MGMw3c=; b=G1ZnoC81vGiTBE2pr6+oQvYCysGmS5jITgvGhbFu0ZboxWDxpE7GMPbIn65qJwI3WW yh1qZ/pd042WfpIzsD6YSPNPISYLkHX1vDnlbeeGrlxI9uD/iuVmYk7qvDcljUqjZS7Z 7kJbOXL9nGdIpnjfI9MR6NNYENw8jGfl0noFEndECDgSzrIqCsE9tSWOxCGXGNrM2KCK M6FDR9cg7tFnR0z6cQsuPs8QXqSsdiZFuigr+IiqtsonwQQ+x9/riRoX2NUPmw6oiOzl ivM6L7WngecBYewFhNeNz+Jc+db3JLTedI8hgzioB5DCl57lbExU4fzi3HLIPXWHXsiC B6Xw== X-Gm-Message-State: AOJu0YwYL+jwRrFMoDCZUoro42Y9Iiw3KyX+TzReSVCAlriDEaOAh0IN H6vgxOyJGGUvu9kchhIC9Aq8yw== X-Google-Smtp-Source: AGHT+IGRwC8czzGNxv7+gIrzDbbEvInAbLQSHx3kWtYOCEkv5SjbtzAZ9TmIWl4yf7c4XHRF3XbbFw== X-Received: by 2002:a62:ab06:0:b0:68e:2d59:b1f3 with SMTP id p6-20020a62ab06000000b0068e2d59b1f3mr4077981pff.13.1699872159711; Mon, 13 Nov 2023 02:42:39 -0800 (PST) Received: from C02F22LSML85.dhcp.broadcom.net ([192.19.252.250]) by smtp.gmail.com with ESMTPSA id ei38-20020a056a0080e600b00682d79199e7sm3606604pfb.200.2023.11.13.02.42.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Nov 2023 02:42:38 -0800 (PST) From: Jithu Jance To: johannes@sipsolutions.net Cc: linux-wireless@vger.kernel.org, vinayak.yadawad@broadcom.com, Jithu Jance Subject: [PATCH v2 1/1] wifi: nl80211: Add PTK/GTK rekey interval attributes for APs supporting PSK offload Date: Mon, 13 Nov 2023 16:12:32 +0530 Message-Id: <20231113104232.97803-1-jithu.jance@broadcom.com> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org This patch adds attributes to NL80211_CMD_START_AP that the user application can use to pass down PTK/GTK rekey interval times to the driver. If driver can't support the configuration, it is expected to return failure to NL8011_CMD_START_AP. The rekey interval timings are to be passed in seconds. --- v1 > v2: Fixed the missing nl80211_policy changes Signed-off-by: Jithu Jance --- include/net/cfg80211.h | 6 ++++++ include/uapi/linux/nl80211.h | 13 +++++++++++++ net/wireless/nl80211.c | 13 +++++++++++++ 3 files changed, 32 insertions(+) diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h index b137a33a1b68..459e29d4d766 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h @@ -1218,6 +1218,10 @@ struct survey_info { * * NL80211_SAE_PWE_BOTH * Allow either hunting-and-pecking loop or hash-to-element + * @ptk_rekey_interval: PTK rekey interval in seconds for drivers supporting + * AP 4 way handshake offload. + * @gtk_rekey_interval: GTK rekey interval in seconds for drivers supporting + * AP 4 way handshake offload. */ struct cfg80211_crypto_settings { u32 wpa_versions; @@ -1235,6 +1239,8 @@ struct cfg80211_crypto_settings { const u8 *sae_pwd; u8 sae_pwd_len; enum nl80211_sae_pwe_mechanism sae_pwe; + u32 ptk_rekey_interval; + u32 gtk_rekey_interval; }; /** diff --git a/include/uapi/linux/nl80211.h b/include/uapi/linux/nl80211.h index dced2c49daec..1bc4650efed1 100644 --- a/include/uapi/linux/nl80211.h +++ b/include/uapi/linux/nl80211.h @@ -205,6 +205,10 @@ * preshared key material is provided, for example when that driver does * not support setting the temporal keys through %NL80211_CMD_NEW_KEY. * + * NL80211_CMD_START_AP can optionally carry %NL80211_ATTR_GTK_REKEY_INTERVAL + * and %NL80211_ATTR_PTK_REKEY_INTERVAL to pass down user configured values to + * the driver. + * * For 802.1X the PMK or PMK-R0 are set by providing %NL80211_ATTR_PMK * using %NL80211_CMD_SET_PMK. For offloaded FT support also * %NL80211_ATTR_PMKR0_NAME must be provided. @@ -2826,6 +2830,12 @@ enum nl80211_commands { * @NL80211_ATTR_MLO_LINK_DISABLED: Flag attribute indicating that the link is * disabled. * + * @NL80211_ATTR_PTK_REKEY_INTERVAL: PTK refresh interval in seconds for drivers + * supporting NL80211_EXT_FEATURE_4WAY_HANDSHAKE_AP_PSK. + * + * @NL80211_ATTR_GTK_REKEY_INTERVAL: GTK refresh interval in seconds for drivers + * supporting NL80211_EXT_FEATURE_4WAY_HANDSHAKE_AP_PSK. + * * @NUM_NL80211_ATTR: total number of nl80211_attrs available * @NL80211_ATTR_MAX: highest attribute number currently defined * @__NL80211_ATTR_AFTER_LAST: internal use @@ -3364,6 +3374,9 @@ enum nl80211_attrs { NL80211_ATTR_MLO_LINK_DISABLED, + NL80211_ATTR_PTK_REKEY_INTERVAL, + NL80211_ATTR_GTK_REKEY_INTERVAL, + /* add attributes here, update the policy in nl80211.c */ __NL80211_ATTR_AFTER_LAST, diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 569234bc2be6..514960e5681d 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -818,6 +818,8 @@ static const struct nla_policy nl80211_policy[NUM_NL80211_ATTR] = { [NL80211_ATTR_HW_TIMESTAMP_ENABLED] = { .type = NLA_FLAG }, [NL80211_ATTR_EMA_RNR_ELEMS] = { .type = NLA_NESTED }, [NL80211_ATTR_MLO_LINK_DISABLED] = { .type = NLA_FLAG }, + [NL80211_ATTR_PTK_REKEY_INTERVAL] = { .type = NLA_U32 }, + [NL80211_ATTR_GTK_REKEY_INTERVAL] = { .type = NLA_U32 }, }; /* policy for the key attributes */ @@ -10892,6 +10894,17 @@ static int nl80211_crypto_settings(struct cfg80211_registered_device *rdev, else settings->sae_pwe = NL80211_SAE_PWE_UNSPECIFIED; + if (info->attrs[NL80211_ATTR_PTK_REKEY_INTERVAL] || + info->attrs[NL80211_ATTR_GTK_REKEY_INTERVAL]) { + if (!wiphy_ext_feature_isset(&rdev->wiphy, + NL80211_EXT_FEATURE_4WAY_HANDSHAKE_AP_PSK)) + return -EINVAL; + if (info->attrs[NL80211_ATTR_PTK_REKEY_INTERVAL]) + settings->ptk_rekey_interval = nla_get_u32(info->attrs[NL80211_ATTR_PTK_REKEY_INTERVAL]); + else + settings->gtk_rekey_interval = nla_get_u32(info->attrs[NL80211_ATTR_GTK_REKEY_INTERVAL]); + } + return 0; }