From patchwork Wed Jan 10 17:09:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denis Kenzior X-Patchwork-Id: 10155709 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 BF53C60231 for ; Wed, 10 Jan 2018 17:09:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A660E2852E for ; Wed, 10 Jan 2018 17:09:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9B03A2854A; Wed, 10 Jan 2018 17:09:57 +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 241B32852E for ; Wed, 10 Jan 2018 17:09:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934386AbeAJRJ4 (ORCPT ); Wed, 10 Jan 2018 12:09:56 -0500 Received: from mail-pl0-f67.google.com ([209.85.160.67]:42473 "EHLO mail-pl0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933445AbeAJRJv (ORCPT ); Wed, 10 Jan 2018 12:09:51 -0500 Received: by mail-pl0-f67.google.com with SMTP id bd8so7643496plb.9 for ; Wed, 10 Jan 2018 09:09:50 -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=JJgitjfFnDWpxkLqq5Az83B38YlxwAlvayrM/JSA9P0=; b=g1bnmmYZmSjSeeL+MAU3uGL5H5RdI3kc/4Mu1Wfoh8KwAgYbH7NGwj0UH+9ayrc/Fw T53bC8gIIsZF8BChtHVe764JZt+ow1y5HRP6MpXWdXRYOLLsqbuTQZC+4qdXD7VTNkv6 Y3rUkNoL9HmU3vaMzqTMHWewdBfbvq9bsubacfg9XWz4k9mkrCyGQOJPcjhDWbFV+Y7d aOonvQZ38agKCB7asrEx64nYCbwOl6AhfR/HQYFQsAF56i0Oie7lAfoUimqzycv/ITLW v+H+1ng8M7LVM/rRH4nVq8Gpfpw0wEFfM1NV8bB4OeTdWYkE2/c/nL7wkGJ5MJ81UUq2 Pk3w== 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=JJgitjfFnDWpxkLqq5Az83B38YlxwAlvayrM/JSA9P0=; b=pJHTpR8GnGKxmIHKwB2hgj3WpihVQcKvbEtGb5i9rYh1jqo4TtHQClUrZtqR7gfF9R s78v9VpYmEiqh6Q0BHaQwrqTjr7DXi15CboHAZxHZahc4W2qPXrDgJ2iOGXeQa4CpKD8 z85drPB7tqmUSyHHdUbKxZM2XQ1qI8NIxL+i8bVq/6l8epcmzX40RrcJ/UrpDg1zNw/6 CVizsG+aPfPbE+aXUV+EHnWRImezDdJteKcJVYCx/Y97Gk2g6FOarOjsl4yerSRGsRM/ qcFNInl7gvGoqidtx4rXIoKbjeFyXfE0kpc3k4i2ykP3rFaQMTW/I5RwZT6QfAPDPAsT Vn0A== X-Gm-Message-State: AKwxyteb32ZjaqX4N9jx14gmPPfMASfktn1GkTtPrAVkYYf/+kwduuAA AL2Sq+ZLiV0Cs2ZuPtKHOerQqw== X-Google-Smtp-Source: ACJfBoud9ZHZSXwv6QlV4N9YDegecUxXlicJCVXGFka4EvfneCOF3JfpI0aF6AE+owcuR1iYwhU4BA== X-Received: by 10.84.233.71 with SMTP id k7mr3028304plt.434.1515604190398; Wed, 10 Jan 2018 09:09:50 -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.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 10 Jan 2018 09:09:49 -0800 (PST) From: Denis Kenzior To: linux-wireless@vger.kernel.org Cc: Denis Kenzior Subject: [RFC v2 3/5] mac80211: Send control port frames over nl80211 Date: Wed, 10 Jan 2018 11:09:36 -0600 Message-Id: <20180110170938.2341-4-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 If userspace requested control port frames to go over 80211, then do so. The control packets are intercepted just prior to delivery of the packet to the underlying network device. Pre-authentication type frames (protocol: 0x88c7) are also forwarded over nl80211. Signed-off-by: Denis Kenzior --- net/mac80211/cfg.c | 2 ++ net/mac80211/ieee80211_i.h | 1 + net/mac80211/mlme.c | 2 ++ net/mac80211/rx.c | 31 ++++++++++++++++++++++++++++--- 4 files changed, 33 insertions(+), 3 deletions(-) diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index 46028e12e216..f53bfb27295f 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -925,6 +925,7 @@ static int ieee80211_start_ap(struct wiphy *wiphy, struct net_device *dev, */ sdata->control_port_protocol = params->crypto.control_port_ethertype; sdata->control_port_no_encrypt = params->crypto.control_port_no_encrypt; + sdata->control_port_over_nl80211 = false; sdata->encrypt_headroom = ieee80211_cs_headroom(sdata->local, ¶ms->crypto, sdata->vif.type); @@ -934,6 +935,7 @@ static int ieee80211_start_ap(struct wiphy *wiphy, struct net_device *dev, params->crypto.control_port_ethertype; vlan->control_port_no_encrypt = params->crypto.control_port_no_encrypt; + vlan->control_port_over_nl80211 = false; vlan->encrypt_headroom = ieee80211_cs_headroom(sdata->local, ¶ms->crypto, diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index 26900025de2f..6f91aea6a4cb 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h @@ -899,6 +899,7 @@ struct ieee80211_sub_if_data { u16 sequence_number; __be16 control_port_protocol; bool control_port_no_encrypt; + bool control_port_over_nl80211; int encrypt_headroom; atomic_t num_tx_queued; diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 39b660b9a908..fc71a906939b 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -4830,6 +4830,8 @@ int ieee80211_mgd_assoc(struct ieee80211_sub_if_data *sdata, sdata->control_port_protocol = req->crypto.control_port_ethertype; sdata->control_port_no_encrypt = req->crypto.control_port_no_encrypt; + sdata->control_port_over_nl80211 = + req->crypto.control_port_over_nl80211; sdata->encrypt_headroom = ieee80211_cs_headroom(local, &req->crypto, sdata->vif.type); diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index b3cff69bfd66..28b74ae1ee48 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -2326,16 +2326,41 @@ ieee80211_deliver_skb(struct ieee80211_rx_data *rx) } #endif - if (skb) { + if (!skb) + goto try_xmit; + + skb->protocol = eth_type_trans(skb, dev); + memset(skb->cb, 0, sizeof(skb->cb)); + + if (unlikely((skb->protocol == sdata->control_port_protocol || + skb->protocol == cpu_to_be16(0x88c7)) && + sdata->control_port_over_nl80211)) { + struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb); + bool noencrypt; + + ehdr = eth_hdr(skb); + + if (status->flag & RX_FLAG_DECRYPTED) + noencrypt = false; + else + noencrypt = true; + + if (!cfg80211_rx_control_port(dev, skb->data, skb->len, + ehdr->h_source, + be16_to_cpu(skb->protocol), + noencrypt)) { + dev_kfree_skb(skb); + skb = NULL; + } + } else { /* deliver to local stack */ - skb->protocol = eth_type_trans(skb, dev); - memset(skb->cb, 0, sizeof(skb->cb)); if (rx->napi) napi_gro_receive(rx->napi, skb); else netif_receive_skb(skb); } +try_xmit: if (xmit_skb) { /* * Send to wireless media and increase priority by 256 to