From patchwork Wed Jan 10 17:09:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denis Kenzior X-Patchwork-Id: 10155707 X-Patchwork-Delegate: johannes@sipsolutions.net Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E662660231 for ; Wed, 10 Jan 2018 17:09:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CFE1328543 for ; Wed, 10 Jan 2018 17:09:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C153E2852E; Wed, 10 Jan 2018 17:09:56 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 487982852E for ; Wed, 10 Jan 2018 17:09:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934376AbeAJRJz (ORCPT ); Wed, 10 Jan 2018 12:09:55 -0500 Received: from mail-pg0-f67.google.com ([74.125.83.67]:35924 "EHLO mail-pg0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934101AbeAJRJw (ORCPT ); Wed, 10 Jan 2018 12:09:52 -0500 Received: by mail-pg0-f67.google.com with SMTP id j2so10091943pgv.3 for ; Wed, 10 Jan 2018 09:09:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ftukecEchekTCdajRKC4I1gGPqzWiDbQs6indUypjVA=; b=hSHwEN8c0UrwAWdX6AsDYmZAqt0rW7Dzwuz59FIVz2SLQyV+sHqg4UmUes+Sz3Ba9r 8RiE1ECBnekpYcV1qhJYvqP1j7L+J4r1j7pxi2eG5yBi0HjJl1kQY5SxmS+VgkCMTNTQ rpfTv2kOlts9unyFdFpMOS/jm6w1KrW0Cx4rvH0lb3RvndwWhSUGq7zdoWW1rSolTC32 tdlJFo99y73Ch/m6kCRAFHMXTL4D5jmU4UAraleNdMuYes9YyTZcsCHyBkejucFLutm0 fMfYc4Dk5hKPATSKdXg4fhbGVhBD0okU9APap4BdDqBPIYICv5WL8BjICcotJWxm/mbg BabA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ftukecEchekTCdajRKC4I1gGPqzWiDbQs6indUypjVA=; b=koWbC8CLPrcDQPpyEDcMY9fkEUPmwvAwZnAwx6igw1dZofF8T9bqs8oxjYT2xarpCj NlM625n9CQHtod8N3+ftlPHzU/GaMVJVtNDWnlmZqQ9xlnf4EmyQwz/adANfRosM4EQ0 xKu1EPMhc7Kc16AZ6eHMGFQzn+4PoS1DKaQ7cAbVK/H2/uxmcfsHkmS+XTv5SGiCmY4u YDFU+eRLbIDxrj+ha4VXad4nRCfDPQJzPB60UpazHjZHJNoK+qTUTAni5o0No/kpqYYa CBRb5IPsGVCnlHMHFdkapjy0QwN6uSqXaTjc9lqVEjRbQFdkKBYC74IZpiO5Rh04+QbM ox9A== X-Gm-Message-State: AKGB3mL93k2iRQ3zlemX2TASTBq0CcUCRLr+aBeU5kQf3wsQWPkwyXIk 36qHBswv3VNcGngO5ZNscSuNMQ== X-Google-Smtp-Source: ACJfBosELq+d3C1tdmV1NWAWeHgsIws4O+QF4eMrv3Guk3Y49jg6kq1dsW/UDpn3oICGTR06//YJKA== X-Received: by 10.98.68.74 with SMTP id r71mr17552453pfa.110.1515604191525; Wed, 10 Jan 2018 09:09:51 -0800 (PST) Received: from new-host-2.home.com (cpe-70-114-247-242.austin.res.rr.com. [70.114.247.242]) by smtp.gmail.com with ESMTPSA id a15sm20029874pfi.55.2018.01.10.09.09.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 10 Jan 2018 09:09:51 -0800 (PST) From: Denis Kenzior To: linux-wireless@vger.kernel.org Cc: Denis Kenzior Subject: [RFC v2 4/5] nl80211: Implement TX of control port frames Date: Wed, 10 Jan 2018 11:09:37 -0600 Message-Id: <20180110170938.2341-5-denkenz@gmail.com> X-Mailer: git-send-email 2.13.5 In-Reply-To: <20180110170938.2341-1-denkenz@gmail.com> References: <20180110170938.2341-1-denkenz@gmail.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This commit implements the TX side of NL80211_CMD_CONTROL_PORT_FRAME. Userspace provides the raw EAPoL frame using NL80211_ATTR_FRAME. Userspace should also provide the destination address and the protocol type to use when sending the frame. This is used to implement TX of Pre-authentication frames. If CONTROL_PORT_ETHERTYPE_NO_ENCRYPT is specified, then the driver will be asked not to encrypt the outgoing frame. Signed-off-by: Denis Kenzior --- include/net/cfg80211.h | 9 ++++++++ net/wireless/nl80211.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++- net/wireless/rdev-ops.h | 15 +++++++++++++ net/wireless/trace.h | 25 +++++++++++++++++++++ 4 files changed, 108 insertions(+), 1 deletion(-) diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h index 84cba57dd8d0..5d1afe3579e7 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h @@ -2924,6 +2924,9 @@ struct cfg80211_pmk_conf { * (invoked with the wireless_dev mutex held) * @del_pmk: delete the previously configured PMK for the given authenticator. * (invoked with the wireless_dev mutex held) + * + * @tx_control_port: TX a control port frame (EAPoL). The noencrypt parameter + * tells the driver that the frame should not be encrypted. */ struct cfg80211_ops { int (*suspend)(struct wiphy *wiphy, struct cfg80211_wowlan *wow); @@ -3217,6 +3220,12 @@ struct cfg80211_ops { const struct cfg80211_pmk_conf *conf); int (*del_pmk)(struct wiphy *wiphy, struct net_device *dev, const u8 *aa); + + int (*tx_control_port)(struct wiphy *wiphy, + struct net_device *dev, + const u8 *buf, size_t len, + const u8 *dest, const u16 proto, + const bool noencrypt); }; /* diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index c0f2bb24e7dd..2c1082c7b1ea 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -12474,6 +12474,57 @@ static int nl80211_del_pmk(struct sk_buff *skb, struct genl_info *info) return ret; } +static int nl80211_tx_control_port(struct sk_buff *skb, struct genl_info *info) +{ + struct cfg80211_registered_device *rdev = info->user_ptr[0]; + struct net_device *dev = info->user_ptr[1]; + struct wireless_dev *wdev = dev->ieee80211_ptr; + const u8 *buf; + size_t len; + u8 *dest; + u16 proto; + bool noencrypt; + int err; + + if (!(rdev->wiphy.flags & WIPHY_FLAG_CONTROL_PORT_OVER_NL80211) || + !rdev->ops->tx_control_port) + return -EOPNOTSUPP; + + if (!info->attrs[NL80211_ATTR_FRAME] || + !info->attrs[NL80211_ATTR_MAC] || + !info->attrs[NL80211_ATTR_CONTROL_PORT_ETHERTYPE]) + return -EINVAL; + + wdev_lock(wdev); + + switch (wdev->iftype) { + case NL80211_IFTYPE_STATION: + if (wdev->current_bss) + break; + err = -ENOTCONN; + goto out; + default: + err = -EOPNOTSUPP; + goto out; + } + + wdev_unlock(wdev); + + buf = nla_data(info->attrs[NL80211_ATTR_FRAME]); + len = nla_len(info->attrs[NL80211_ATTR_FRAME]); + dest = nla_data(info->attrs[NL80211_ATTR_MAC]); + proto = nla_get_u16(info->attrs[NL80211_ATTR_CONTROL_PORT_ETHERTYPE]); + noencrypt = + nla_get_flag(info->attrs[NL80211_ATTR_CONTROL_PORT_NO_ENCRYPT]); + + return rdev_tx_control_port(rdev, dev, buf, len, + dest, cpu_to_be16(proto), noencrypt); + + out: + wdev_unlock(wdev); + return err; +} + #define NL80211_FLAG_NEED_WIPHY 0x01 #define NL80211_FLAG_NEED_NETDEV 0x02 #define NL80211_FLAG_NEED_RTNL 0x04 @@ -13369,7 +13420,14 @@ static const struct genl_ops nl80211_ops[] = { .internal_flags = NL80211_FLAG_NEED_NETDEV_UP | NL80211_FLAG_NEED_RTNL, }, - + { + .cmd = NL80211_CMD_CONTROL_PORT_FRAME, + .doit = nl80211_tx_control_port, + .policy = nl80211_policy, + .flags = GENL_UNS_ADMIN_PERM, + .internal_flags = NL80211_FLAG_NEED_NETDEV_UP | + NL80211_FLAG_NEED_RTNL, + }, }; static struct genl_family nl80211_fam __ro_after_init = { diff --git a/net/wireless/rdev-ops.h b/net/wireless/rdev-ops.h index 0c06240d25af..fbd67e32bb91 100644 --- a/net/wireless/rdev-ops.h +++ b/net/wireless/rdev-ops.h @@ -714,6 +714,21 @@ static inline int rdev_mgmt_tx(struct cfg80211_registered_device *rdev, return ret; } +static inline int rdev_tx_control_port(struct cfg80211_registered_device *rdev, + struct net_device *dev, + const void *buf, size_t len, + const u8 *dest, u16 proto, + const bool noencrypt) +{ + int ret; + trace_rdev_tx_control_port(&rdev->wiphy, dev, buf, len, + dest, proto, noencrypt); + ret = rdev->ops->tx_control_port(&rdev->wiphy, dev, buf, len, + dest, proto, noencrypt); + trace_rdev_return_int(&rdev->wiphy, ret); + return ret; +} + static inline int rdev_mgmt_tx_cancel_wait(struct cfg80211_registered_device *rdev, struct wireless_dev *wdev, u64 cookie) diff --git a/net/wireless/trace.h b/net/wireless/trace.h index 48bb1c1eaf67..212c499bf51e 100644 --- a/net/wireless/trace.h +++ b/net/wireless/trace.h @@ -1882,6 +1882,31 @@ TRACE_EVENT(rdev_mgmt_tx, BOOL_TO_STR(__entry->dont_wait_for_ack)) ); +TRACE_EVENT(rdev_tx_control_port, + TP_PROTO(struct wiphy *wiphy, struct net_device *netdev, + const u8 *buf, size_t len, const u8 *dest, u16 proto, + bool unencrypted), + TP_ARGS(wiphy, netdev, buf, len, dest, proto, unencrypted), + TP_STRUCT__entry( + WIPHY_ENTRY + NETDEV_ENTRY + MAC_ENTRY(dest) + __field(u16, proto) + __field(bool, unencrypted) + ), + TP_fast_assign( + WIPHY_ASSIGN; + NETDEV_ASSIGN; + MAC_ASSIGN(dest, dest); + __entry->proto = proto; + __entry->unencrypted = unencrypted; + ), + TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT ", " MAC_PR_FMT "," + " proto: %x, unencrypted: %s", + WIPHY_PR_ARG, NETDEV_PR_ARG, MAC_PR_ARG(dest), + __entry->proto, BOOL_TO_STR(__entry->unencrypted)) +); + TRACE_EVENT(rdev_set_noack_map, TP_PROTO(struct wiphy *wiphy, struct net_device *netdev, u16 noack_map),