Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5cbee557 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'mac80211-for-davem-2016-10-18' of... 

Merge tag 'mac80211-for-davem-2016-10-18' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211



Johannes Berg says:

====================
This is relatively small, mostly to get the SG/crypto
from stack removal fix that crashes things when VMAP
stack is used in conjunction with software crypto.

Aside from that, we have:
 * a fix for AP_VLAN usage with the nl80211 frame command
 * two fixes (and two preparation patches) for A-MSDU, one
   to discard group-addressed (multicast) and unexpected
   4-address A-MSDUs, the other to validate A-MSDU inner
   MAC addresses properly to prevent controlled port bypass
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 6bc80629 f4a067f9

drivers/net/wireless/marvell/mwifiex/11n_rxreorder.c

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ static int mwifiex_11n_dispatch_amsdu_pkt(struct mwifiex_private *priv, 
		skb_trim(skb, le16_to_cpu(local_rx_pd->rx_pkt_length));



		ieee80211_amsdu_to_8023s(skb, &list, priv->curr_addr,

					 priv->wdev.iftype, 0, false);

					 priv->wdev.iftype, 0, NULL, NULL);



		while (!skb_queue_empty(&list)) {

			struct rx_packet_hdr *rx_hdr;

include/net/cfg80211.h

+24 −8
Original line number Diff line number Diff line
@@ -4039,6 +4039,18 @@ unsigned int ieee80211_get_mesh_hdrlen(struct ieee80211s_hdr *meshhdr); 
 * that do not do the 802.11/802.3 conversion on the device.

 */



/**

 * ieee80211_data_to_8023_exthdr - convert an 802.11 data frame to 802.3

 * @skb: the 802.11 data frame

 * @ehdr: pointer to a &struct ethhdr that will get the header, instead

 *	of it being pushed into the SKB

 * @addr: the device MAC address

 * @iftype: the virtual interface type

 * Return: 0 on success. Non-zero on error.

 */

int ieee80211_data_to_8023_exthdr(struct sk_buff *skb, struct ethhdr *ehdr,

				  const u8 *addr, enum nl80211_iftype iftype);



/**

 * ieee80211_data_to_8023 - convert an 802.11 data frame to 802.3

 * @skb: the 802.11 data frame
@@ -4046,8 +4058,11 @@ unsigned int ieee80211_get_mesh_hdrlen(struct ieee80211s_hdr *meshhdr); 
 * @iftype: the virtual interface type

 * Return: 0 on success. Non-zero on error.

 */

int ieee80211_data_to_8023(struct sk_buff *skb, const u8 *addr,

			   enum nl80211_iftype iftype);

static inline int ieee80211_data_to_8023(struct sk_buff *skb, const u8 *addr,

					 enum nl80211_iftype iftype)

{

	return ieee80211_data_to_8023_exthdr(skb, NULL, addr, iftype);

}



/**

 * ieee80211_data_from_8023 - convert an 802.3 frame to 802.11
@@ -4065,22 +4080,23 @@ int ieee80211_data_from_8023(struct sk_buff *skb, const u8 *addr, 
/**

 * ieee80211_amsdu_to_8023s - decode an IEEE 802.11n A-MSDU frame

 *

 * Decode an IEEE 802.11n A-MSDU frame and convert it to a list of

 * 802.3 frames. The @list will be empty if the decode fails. The

 * @skb is consumed after the function returns.

 * Decode an IEEE 802.11 A-MSDU and convert it to a list of 802.3 frames.

 * The @list will be empty if the decode fails. The @skb must be fully

 * header-less before being passed in here; it is freed in this function.

 *

 * @skb: The input IEEE 802.11n A-MSDU frame.

 * @skb: The input A-MSDU frame without any headers.

 * @list: The output list of 802.3 frames. It must be allocated and

 *	initialized by by the caller.

 * @addr: The device MAC address.

 * @iftype: The device interface type.

 * @extra_headroom: The hardware extra headroom for SKBs in the @list.

 * @has_80211_header: Set it true if SKB is with IEEE 802.11 header.

 * @check_da: DA to check in the inner ethernet header, or NULL

 * @check_sa: SA to check in the inner ethernet header, or NULL

 */

void ieee80211_amsdu_to_8023s(struct sk_buff *skb, struct sk_buff_head *list,

			      const u8 *addr, enum nl80211_iftype iftype,

			      const unsigned int extra_headroom,

			      bool has_80211_header);

			      const u8 *check_da, const u8 *check_sa);



/**

 * cfg80211_classify8021d - determine the 802.1p/1d tag for a data frame

net/mac80211/aes_ccm.c

+30 −16
Original line number Diff line number Diff line
@@ -18,21 +18,24 @@ 
#include "key.h"

#include "aes_ccm.h"



void ieee80211_aes_ccm_encrypt(struct crypto_aead *tfm, u8 *b_0, u8 *aad,

int ieee80211_aes_ccm_encrypt(struct crypto_aead *tfm, u8 *b_0, u8 *aad,

			      u8 *data, size_t data_len, u8 *mic,

			      size_t mic_len)

{

	struct scatterlist sg[3];

	struct aead_request *aead_req;

	int reqsize = sizeof(*aead_req) + crypto_aead_reqsize(tfm);

	u8 *__aad;



	char aead_req_data[sizeof(struct aead_request) +

			   crypto_aead_reqsize(tfm)]

		__aligned(__alignof__(struct aead_request));

	struct aead_request *aead_req = (void *) aead_req_data;

	aead_req = kzalloc(reqsize + CCM_AAD_LEN, GFP_ATOMIC);

	if (!aead_req)

		return -ENOMEM;



	memset(aead_req, 0, sizeof(aead_req_data));

	__aad = (u8 *)aead_req + reqsize;

	memcpy(__aad, aad, CCM_AAD_LEN);



	sg_init_table(sg, 3);

	sg_set_buf(&sg[0], &aad[2], be16_to_cpup((__be16 *)aad));

	sg_set_buf(&sg[0], &__aad[2], be16_to_cpup((__be16 *)__aad));

	sg_set_buf(&sg[1], data, data_len);

	sg_set_buf(&sg[2], mic, mic_len);
@@ -41,6 +44,9 @@ void ieee80211_aes_ccm_encrypt(struct crypto_aead *tfm, u8 *b_0, u8 *aad, 
	aead_request_set_ad(aead_req, sg[0].length);



	crypto_aead_encrypt(aead_req);

	kzfree(aead_req);



	return 0;

}



int ieee80211_aes_ccm_decrypt(struct crypto_aead *tfm, u8 *b_0, u8 *aad,
@@ -48,18 +54,23 @@ int ieee80211_aes_ccm_decrypt(struct crypto_aead *tfm, u8 *b_0, u8 *aad, 
			      size_t mic_len)

{

	struct scatterlist sg[3];

	char aead_req_data[sizeof(struct aead_request) +

			   crypto_aead_reqsize(tfm)]

		__aligned(__alignof__(struct aead_request));

	struct aead_request *aead_req = (void *) aead_req_data;

	struct aead_request *aead_req;

	int reqsize = sizeof(*aead_req) + crypto_aead_reqsize(tfm);

	u8 *__aad;

	int err;



	if (data_len == 0)

		return -EINVAL;



	memset(aead_req, 0, sizeof(aead_req_data));

	aead_req = kzalloc(reqsize + CCM_AAD_LEN, GFP_ATOMIC);

	if (!aead_req)

		return -ENOMEM;



	__aad = (u8 *)aead_req + reqsize;

	memcpy(__aad, aad, CCM_AAD_LEN);



	sg_init_table(sg, 3);

	sg_set_buf(&sg[0], &aad[2], be16_to_cpup((__be16 *)aad));

	sg_set_buf(&sg[0], &__aad[2], be16_to_cpup((__be16 *)__aad));

	sg_set_buf(&sg[1], data, data_len);

	sg_set_buf(&sg[2], mic, mic_len);
@@ -67,7 +78,10 @@ int ieee80211_aes_ccm_decrypt(struct crypto_aead *tfm, u8 *b_0, u8 *aad, 
	aead_request_set_crypt(aead_req, sg, sg, data_len + mic_len, b_0);

	aead_request_set_ad(aead_req, sg[0].length);



	return crypto_aead_decrypt(aead_req);

	err = crypto_aead_decrypt(aead_req);

	kzfree(aead_req);



	return err;

}



struct crypto_aead *ieee80211_aes_key_setup_encrypt(const u8 key[],

net/mac80211/aes_ccm.h

+5 −3
Original line number Diff line number Diff line
@@ -12,10 +12,12 @@ 


#include <linux/crypto.h>



#define CCM_AAD_LEN	32



struct crypto_aead *ieee80211_aes_key_setup_encrypt(const u8 key[],

						    size_t key_len,

						    size_t mic_len);

void ieee80211_aes_ccm_encrypt(struct crypto_aead *tfm, u8 *b_0, u8 *aad,

int ieee80211_aes_ccm_encrypt(struct crypto_aead *tfm, u8 *b_0, u8 *aad,

			      u8 *data, size_t data_len, u8 *mic,

			      size_t mic_len);

int ieee80211_aes_ccm_decrypt(struct crypto_aead *tfm, u8 *b_0, u8 *aad,

net/mac80211/aes_gcm.c

+28 −15
Original line number Diff line number Diff line
@@ -15,20 +15,23 @@ 
#include "key.h"

#include "aes_gcm.h"



void ieee80211_aes_gcm_encrypt(struct crypto_aead *tfm, u8 *j_0, u8 *aad,

int ieee80211_aes_gcm_encrypt(struct crypto_aead *tfm, u8 *j_0, u8 *aad,

			      u8 *data, size_t data_len, u8 *mic)

{

	struct scatterlist sg[3];

	struct aead_request *aead_req;

	int reqsize = sizeof(*aead_req) + crypto_aead_reqsize(tfm);

	u8 *__aad;



	char aead_req_data[sizeof(struct aead_request) +

			   crypto_aead_reqsize(tfm)]

		__aligned(__alignof__(struct aead_request));

	struct aead_request *aead_req = (void *)aead_req_data;

	aead_req = kzalloc(reqsize + GCM_AAD_LEN, GFP_ATOMIC);

	if (!aead_req)

		return -ENOMEM;



	memset(aead_req, 0, sizeof(aead_req_data));

	__aad = (u8 *)aead_req + reqsize;

	memcpy(__aad, aad, GCM_AAD_LEN);



	sg_init_table(sg, 3);

	sg_set_buf(&sg[0], &aad[2], be16_to_cpup((__be16 *)aad));

	sg_set_buf(&sg[0], &__aad[2], be16_to_cpup((__be16 *)__aad));

	sg_set_buf(&sg[1], data, data_len);

	sg_set_buf(&sg[2], mic, IEEE80211_GCMP_MIC_LEN);
@@ -37,24 +40,31 @@ void ieee80211_aes_gcm_encrypt(struct crypto_aead *tfm, u8 *j_0, u8 *aad, 
	aead_request_set_ad(aead_req, sg[0].length);



	crypto_aead_encrypt(aead_req);

	kzfree(aead_req);

	return 0;

}



int ieee80211_aes_gcm_decrypt(struct crypto_aead *tfm, u8 *j_0, u8 *aad,

			      u8 *data, size_t data_len, u8 *mic)

{

	struct scatterlist sg[3];

	char aead_req_data[sizeof(struct aead_request) +

			   crypto_aead_reqsize(tfm)]

		__aligned(__alignof__(struct aead_request));

	struct aead_request *aead_req = (void *)aead_req_data;

	struct aead_request *aead_req;

	int reqsize = sizeof(*aead_req) + crypto_aead_reqsize(tfm);

	u8 *__aad;

	int err;



	if (data_len == 0)

		return -EINVAL;



	memset(aead_req, 0, sizeof(aead_req_data));

	aead_req = kzalloc(reqsize + GCM_AAD_LEN, GFP_ATOMIC);

	if (!aead_req)

		return -ENOMEM;



	__aad = (u8 *)aead_req + reqsize;

	memcpy(__aad, aad, GCM_AAD_LEN);



	sg_init_table(sg, 3);

	sg_set_buf(&sg[0], &aad[2], be16_to_cpup((__be16 *)aad));

	sg_set_buf(&sg[0], &__aad[2], be16_to_cpup((__be16 *)__aad));

	sg_set_buf(&sg[1], data, data_len);

	sg_set_buf(&sg[2], mic, IEEE80211_GCMP_MIC_LEN);
@@ -63,7 +73,10 @@ int ieee80211_aes_gcm_decrypt(struct crypto_aead *tfm, u8 *j_0, u8 *aad, 
			       data_len + IEEE80211_GCMP_MIC_LEN, j_0);

	aead_request_set_ad(aead_req, sg[0].length);



	return crypto_aead_decrypt(aead_req);

	err = crypto_aead_decrypt(aead_req);

	kzfree(aead_req);



	return err;

}



struct crypto_aead *ieee80211_aes_gcm_key_setup_encrypt(const u8 key[],