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

Commit 54d2495b authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "ath9k: Fix general protection fault in ath9k_hif_usb_rx_cb" 



This reverts commit bdf4d37b which is
commit 2bbcaaee1fcbd83272e29f31e2bb7e70d8c49e05 upstream.

It is being reverted upstream, just hasn't made it there yet and is
causing lots of problems.

Reported-by: default avatarHans de Goede <hdegoede@redhat.com>
Cc: Qiujun Huang <hqjagain@gmail.com>
Cc: Kalle Valo <kvalo@codeaurora.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b80e052c

drivers/net/wireless/ath/ath9k/hif_usb.c

+11 −37
Original line number Diff line number Diff line
@@ -643,9 +643,9 @@ static void ath9k_hif_usb_rx_stream(struct hif_device_usb *hif_dev, 


static void ath9k_hif_usb_rx_cb(struct urb *urb)

{

	struct rx_buf *rx_buf = (struct rx_buf *)urb->context;

	struct hif_device_usb *hif_dev = rx_buf->hif_dev;

	struct sk_buff *skb = rx_buf->skb;

	struct sk_buff *skb = (struct sk_buff *) urb->context;

	struct hif_device_usb *hif_dev =

		usb_get_intfdata(usb_ifnum_to_if(urb->dev, 0));

	int ret;



	if (!skb)
@@ -685,15 +685,14 @@ static void ath9k_hif_usb_rx_cb(struct urb *urb) 
	return;

free:

	kfree_skb(skb);

	kfree(rx_buf);

}



static void ath9k_hif_usb_reg_in_cb(struct urb *urb)

{

	struct rx_buf *rx_buf = (struct rx_buf *)urb->context;

	struct hif_device_usb *hif_dev = rx_buf->hif_dev;

	struct sk_buff *skb = rx_buf->skb;

	struct sk_buff *skb = (struct sk_buff *) urb->context;

	struct sk_buff *nskb;

	struct hif_device_usb *hif_dev =

		usb_get_intfdata(usb_ifnum_to_if(urb->dev, 0));

	int ret;



	if (!skb)
@@ -751,7 +750,6 @@ static void ath9k_hif_usb_reg_in_cb(struct urb *urb) 
	return;

free:

	kfree_skb(skb);

	kfree(rx_buf);

	urb->context = NULL;

}
@@ -797,7 +795,7 @@ static int ath9k_hif_usb_alloc_tx_urbs(struct hif_device_usb *hif_dev) 
	init_usb_anchor(&hif_dev->mgmt_submitted);



	for (i = 0; i < MAX_TX_URB_NUM; i++) {

		tx_buf = kzalloc(sizeof(*tx_buf), GFP_KERNEL);

		tx_buf = kzalloc(sizeof(struct tx_buf), GFP_KERNEL);

		if (!tx_buf)

			goto err;
@@ -834,9 +832,8 @@ static void ath9k_hif_usb_dealloc_rx_urbs(struct hif_device_usb *hif_dev) 


static int ath9k_hif_usb_alloc_rx_urbs(struct hif_device_usb *hif_dev)

{

	struct rx_buf *rx_buf = NULL;

	struct sk_buff *skb = NULL;

	struct urb *urb = NULL;

	struct sk_buff *skb = NULL;

	int i, ret;



	init_usb_anchor(&hif_dev->rx_submitted);
@@ -844,12 +841,6 @@ static int ath9k_hif_usb_alloc_rx_urbs(struct hif_device_usb *hif_dev) 


	for (i = 0; i < MAX_RX_URB_NUM; i++) {



		rx_buf = kzalloc(sizeof(*rx_buf), GFP_KERNEL);

		if (!rx_buf) {

			ret = -ENOMEM;

			goto err_rxb;

		}



		/* Allocate URB */

		urb = usb_alloc_urb(0, GFP_KERNEL);

		if (urb == NULL) {
@@ -864,14 +855,11 @@ static int ath9k_hif_usb_alloc_rx_urbs(struct hif_device_usb *hif_dev) 
			goto err_skb;

		}



		rx_buf->hif_dev = hif_dev;

		rx_buf->skb = skb;



		usb_fill_bulk_urb(urb, hif_dev->udev,

				  usb_rcvbulkpipe(hif_dev->udev,

						  USB_WLAN_RX_PIPE),

				  skb->data, MAX_RX_BUF_SIZE,

				  ath9k_hif_usb_rx_cb, rx_buf);

				  ath9k_hif_usb_rx_cb, skb);



		/* Anchor URB */

		usb_anchor_urb(urb, &hif_dev->rx_submitted);
@@ -897,8 +885,6 @@ static int ath9k_hif_usb_alloc_rx_urbs(struct hif_device_usb *hif_dev) 
err_skb:

	usb_free_urb(urb);

err_urb:

	kfree(rx_buf);

err_rxb:

	ath9k_hif_usb_dealloc_rx_urbs(hif_dev);

	return ret;

}
@@ -910,21 +896,14 @@ static void ath9k_hif_usb_dealloc_reg_in_urbs(struct hif_device_usb *hif_dev) 


static int ath9k_hif_usb_alloc_reg_in_urbs(struct hif_device_usb *hif_dev)

{

	struct rx_buf *rx_buf = NULL;

	struct sk_buff *skb = NULL;

	struct urb *urb = NULL;

	struct sk_buff *skb = NULL;

	int i, ret;



	init_usb_anchor(&hif_dev->reg_in_submitted);



	for (i = 0; i < MAX_REG_IN_URB_NUM; i++) {



		rx_buf = kzalloc(sizeof(*rx_buf), GFP_KERNEL);

		if (!rx_buf) {

			ret = -ENOMEM;

			goto err_rxb;

		}



		/* Allocate URB */

		urb = usb_alloc_urb(0, GFP_KERNEL);

		if (urb == NULL) {
@@ -939,14 +918,11 @@ static int ath9k_hif_usb_alloc_reg_in_urbs(struct hif_device_usb *hif_dev) 
			goto err_skb;

		}



		rx_buf->hif_dev = hif_dev;

		rx_buf->skb = skb;



		usb_fill_int_urb(urb, hif_dev->udev,

				  usb_rcvintpipe(hif_dev->udev,

						  USB_REG_IN_PIPE),

				  skb->data, MAX_REG_IN_BUF_SIZE,

				  ath9k_hif_usb_reg_in_cb, rx_buf, 1);

				  ath9k_hif_usb_reg_in_cb, skb, 1);



		/* Anchor URB */

		usb_anchor_urb(urb, &hif_dev->reg_in_submitted);
@@ -972,8 +948,6 @@ static int ath9k_hif_usb_alloc_reg_in_urbs(struct hif_device_usb *hif_dev) 
err_skb:

	usb_free_urb(urb);

err_urb:

	kfree(rx_buf);

err_rxb:

	ath9k_hif_usb_dealloc_reg_in_urbs(hif_dev);

	return ret;

}

drivers/net/wireless/ath/ath9k/hif_usb.h

+0 −5
Original line number Diff line number Diff line
@@ -86,11 +86,6 @@ struct tx_buf { 
	struct list_head list;

};



struct rx_buf {

	struct sk_buff *skb;

	struct hif_device_usb *hif_dev;

};



#define HIF_USB_TX_STOP  BIT(0)

#define HIF_USB_TX_FLUSH BIT(1)