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

Commit d8902b43 authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman
Browse files

rsi: fix use-after-free on failed probe and unbind 



commit e93cd35101b61e4c79149be2cfc927c4b28dc60c upstream.

Make sure to stop both URBs before returning after failed probe as well
as on disconnect to avoid use-after-free in the completion handler.

Reported-by: default avatar <syzbot+b563b7f8dbe8223a51e8@syzkaller.appspotmail.com>
Fixes: a4302bff ("rsi: add bluetooth rx endpoint")
Fixes: dad0d04f ("rsi: Add RS9113 wireless driver")
Cc: stable <stable@vger.kernel.org>     # 3.15
Cc: Siva Rebbagondla <siva.rebbagondla@redpinesignals.com>
Cc: Prameela Rani Garnepudi <prameela.j04cs@gmail.com>
Cc: Amitkumar Karwar <amit.karwar@redpinesignals.com>
Cc: Fariya Fatima <fariyaf@gmail.com>
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 99d91382

drivers/net/wireless/rsi/rsi_91x_usb.c

+17 −1
Original line number Original line Diff line number Diff line
@@ -292,6 +292,15 @@ static void rsi_rx_done_handler(struct urb *urb) 
		dev_kfree_skb(rx_cb->rx_skb);

		dev_kfree_skb(rx_cb->rx_skb);

}

}





static void rsi_rx_urb_kill(struct rsi_hw *adapter, u8 ep_num)

{

	struct rsi_91x_usbdev *dev = (struct rsi_91x_usbdev *)adapter->rsi_dev;

	struct rx_usb_ctrl_block *rx_cb = &dev->rx_cb[ep_num - 1];

	struct urb *urb = rx_cb->rx_urb;



	usb_kill_urb(urb);

}



/**

/**

 * rsi_rx_urb_submit() - This function submits the given URB to the USB stack.

 * rsi_rx_urb_submit() - This function submits the given URB to the USB stack.

 * @adapter: Pointer to the adapter structure.

 * @adapter: Pointer to the adapter structure.
@@ -823,10 +832,13 @@ static int rsi_probe(struct usb_interface *pfunction, 
	if (adapter->priv->coex_mode > 1) {

	if (adapter->priv->coex_mode > 1) {

		status = rsi_rx_urb_submit(adapter, BT_EP);

		status = rsi_rx_urb_submit(adapter, BT_EP);

		if (status)

		if (status)

			goto err1;

			goto err_kill_wlan_urb;

	}

	}





	return 0;

	return 0;



err_kill_wlan_urb:

	rsi_rx_urb_kill(adapter, WLAN_EP);

err1:

err1:

	rsi_deinit_usb_interface(adapter);

	rsi_deinit_usb_interface(adapter);

err:

err:
@@ -857,6 +869,10 @@ static void rsi_disconnect(struct usb_interface *pfunction) 
		adapter->priv->bt_adapter = NULL;

		adapter->priv->bt_adapter = NULL;

	}

	}





	if (adapter->priv->coex_mode > 1)

		rsi_rx_urb_kill(adapter, BT_EP);

	rsi_rx_urb_kill(adapter, WLAN_EP);



	rsi_reset_card(adapter);

	rsi_reset_card(adapter);

	rsi_deinit_usb_interface(adapter);

	rsi_deinit_usb_interface(adapter);

	rsi_91x_deinit(adapter);

	rsi_91x_deinit(adapter);