| Message ID | 20191128172204.26600-2-johan@kernel.org (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | e93cd35101b61e4c79149be2cfc927c4b28dc60c |
| Headers | show |
| Series | rsi: fix use-after-free, memleak and sleep-while-atomic | expand |
Johan Hovold <johan@kernel.org> wrote: > 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: syzbot+b563b7f8dbe8223a51e8@syzkaller.appspotmail.com > Fixes: a4302bff28e2 ("rsi: add bluetooth rx endpoint") > Fixes: dad0d04fa7ba ("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: Johan Hovold <johan@kernel.org> 5 patches applied to wireless-drivers-next.git, thanks. e93cd35101b6 rsi: fix use-after-free on failed probe and unbind 92aafe77123a rsi: fix use-after-free on probe errors 477682974811 rsi: fix memory leak on failed URB submission b9b9f9fea218 rsi: fix non-atomic allocation in completion handler 960da557f435 rsi: add missing endpoint sanity checks
diff --git a/drivers/net/wireless/rsi/rsi_91x_usb.c b/drivers/net/wireless/rsi/rsi_91x_usb.c index 53f41fc2cadf..30bed719486e 100644 --- a/drivers/net/wireless/rsi/rsi_91x_usb.c +++ b/drivers/net/wireless/rsi/rsi_91x_usb.c @@ -292,6 +292,15 @@ static void rsi_rx_done_handler(struct urb *urb) 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. * @adapter: Pointer to the adapter structure. @@ -823,10 +832,13 @@ static int rsi_probe(struct usb_interface *pfunction, if (adapter->priv->coex_mode > 1) { status = rsi_rx_urb_submit(adapter, BT_EP); if (status) - goto err1; + goto err_kill_wlan_urb; } return 0; + +err_kill_wlan_urb: + rsi_rx_urb_kill(adapter, WLAN_EP); err1: rsi_deinit_usb_interface(adapter); err: @@ -857,6 +869,10 @@ static void rsi_disconnect(struct usb_interface *pfunction) 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_deinit_usb_interface(adapter); rsi_91x_deinit(adapter);
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: syzbot+b563b7f8dbe8223a51e8@syzkaller.appspotmail.com Fixes: a4302bff28e2 ("rsi: add bluetooth rx endpoint") Fixes: dad0d04fa7ba ("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: Johan Hovold <johan@kernel.org> --- drivers/net/wireless/rsi/rsi_91x_usb.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-)