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

Commit 2bc979f2 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'wireless-drivers-for-davem-2017-01-10' of... 

Merge tag 'wireless-drivers-for-davem-2017-01-10' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers



Kalle Valo says:

====================
wireless-drivers fixes for 4.10

Only two fixes at this time. The rtlwifi fix is an important one as it
fixes a reported oops and Linus was already asking about it. The
orinoco fix is not tested on a real device, because it's old legacy
hardware and hardly no-one use it, but it should fix a (theoretical)
issue with VMAP_STACK.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 6bb629db 60f59ce0

drivers/net/wireless/intersil/orinoco/mic.c

+26 −18
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
/********************************************************************/

int orinoco_mic_init(struct orinoco_private *priv)

{

	priv->tx_tfm_mic = crypto_alloc_ahash("michael_mic", 0,

	priv->tx_tfm_mic = crypto_alloc_shash("michael_mic", 0,

					      CRYPTO_ALG_ASYNC);

	if (IS_ERR(priv->tx_tfm_mic)) {

		printk(KERN_DEBUG "orinoco_mic_init: could not allocate "
@@ -25,7 +25,7 @@ int orinoco_mic_init(struct orinoco_private *priv) 
		return -ENOMEM;

	}



	priv->rx_tfm_mic = crypto_alloc_ahash("michael_mic", 0,

	priv->rx_tfm_mic = crypto_alloc_shash("michael_mic", 0,

					      CRYPTO_ALG_ASYNC);

	if (IS_ERR(priv->rx_tfm_mic)) {

		printk(KERN_DEBUG "orinoco_mic_init: could not allocate "
@@ -40,17 +40,16 @@ int orinoco_mic_init(struct orinoco_private *priv) 
void orinoco_mic_free(struct orinoco_private *priv)

{

	if (priv->tx_tfm_mic)

		crypto_free_ahash(priv->tx_tfm_mic);

		crypto_free_shash(priv->tx_tfm_mic);

	if (priv->rx_tfm_mic)

		crypto_free_ahash(priv->rx_tfm_mic);

		crypto_free_shash(priv->rx_tfm_mic);

}



int orinoco_mic(struct crypto_ahash *tfm_michael, u8 *key,

int orinoco_mic(struct crypto_shash *tfm_michael, u8 *key,

		u8 *da, u8 *sa, u8 priority,

		u8 *data, size_t data_len, u8 *mic)

{

	AHASH_REQUEST_ON_STACK(req, tfm_michael);

	struct scatterlist sg[2];

	SHASH_DESC_ON_STACK(desc, tfm_michael);

	u8 hdr[ETH_HLEN + 2]; /* size of header + padding */

	int err;
@@ -67,18 +66,27 @@ int orinoco_mic(struct crypto_ahash *tfm_michael, u8 *key, 
	hdr[ETH_ALEN * 2 + 2] = 0;

	hdr[ETH_ALEN * 2 + 3] = 0;



	/* Use scatter gather to MIC header and data in one go */

	sg_init_table(sg, 2);

	sg_set_buf(&sg[0], hdr, sizeof(hdr));

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

	desc->tfm = tfm_michael;

	desc->flags = 0;



	if (crypto_ahash_setkey(tfm_michael, key, MIC_KEYLEN))

		return -1;

	err = crypto_shash_setkey(tfm_michael, key, MIC_KEYLEN);

	if (err)

		return err;



	err = crypto_shash_init(desc);

	if (err)

		return err;



	err = crypto_shash_update(desc, hdr, sizeof(hdr));

	if (err)

		return err;



	err = crypto_shash_update(desc, data, data_len);

	if (err)

		return err;



	err = crypto_shash_final(desc, mic);

	shash_desc_zero(desc);



	ahash_request_set_tfm(req, tfm_michael);

	ahash_request_set_callback(req, 0, NULL, NULL);

	ahash_request_set_crypt(req, sg, mic, data_len + sizeof(hdr));

	err = crypto_ahash_digest(req);

	ahash_request_zero(req);

	return err;

}

drivers/net/wireless/intersil/orinoco/mic.h

+2 −1
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
#define _ORINOCO_MIC_H_



#include <linux/types.h>

#include <crypto/hash.h>



#define MICHAEL_MIC_LEN 8
@@ -15,7 +16,7 @@ struct crypto_ahash; 


int orinoco_mic_init(struct orinoco_private *priv);

void orinoco_mic_free(struct orinoco_private *priv);

int orinoco_mic(struct crypto_ahash *tfm_michael, u8 *key,

int orinoco_mic(struct crypto_shash *tfm_michael, u8 *key,

		u8 *da, u8 *sa, u8 priority,

		u8 *data, size_t data_len, u8 *mic);

drivers/net/wireless/intersil/orinoco/orinoco.h

+2 −2
Original line number Diff line number Diff line
@@ -152,8 +152,8 @@ struct orinoco_private { 
	u8 *wpa_ie;

	int wpa_ie_len;



	struct crypto_ahash *rx_tfm_mic;

	struct crypto_ahash *tx_tfm_mic;

	struct crypto_shash *rx_tfm_mic;

	struct crypto_shash *tx_tfm_mic;



	unsigned int wpa_enabled:1;

	unsigned int tkip_cm_active:1;

drivers/net/wireless/realtek/rtlwifi/usb.c

+1 −0
Original line number Diff line number Diff line
@@ -1063,6 +1063,7 @@ int rtl_usb_probe(struct usb_interface *intf, 
		return -ENOMEM;

	}

	rtlpriv = hw->priv;

	rtlpriv->hw = hw;

	rtlpriv->usb_data = kzalloc(RTL_USB_MAX_RX_COUNT * sizeof(u32),

				    GFP_KERNEL);

	if (!rtlpriv->usb_data)