Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 7e7797e7f6f7bfab73fca02c65e40eaa5bb9000c

Authored by Johan Hovold
Committed by Greg Kroah-Hartman
1 parent 15e5bee33f
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

USB: cdc-acm: fix potential null-pointer dereference on disconnect 

Fix potential null-pointer exception on disconnect introduced by commit
11ea859d64b69a747d6b060b9ed1520eab1161fe (USB: additional power savings
for cdc-acm devices that support remote wakeup).

Only access acm->dev after making sure it is non-null in control urb
completion handler.

Cc: stable <stable@kernel.org>
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Showing 1 changed file with 2 additions and 1 deletions Side-by-side Diff

drivers/usb/class/cdc-acm.c
Diff comments   View file @ 7e7797e
... ... @@ -297,6 +297,8 @@
297 297 if (!ACM_READY(acm))
298 298 goto exit;
299 299  
  300 + usb_mark_last_busy(acm->dev);
  301 +
300 302 data = (unsigned char *)(dr + 1);
301 303 switch (dr->bNotificationType) {
302 304 case USB_CDC_NOTIFY_NETWORK_CONNECTION:
... ... @@ -336,7 +338,6 @@
336 338 break;
337 339 }
338 340 exit:
339   - usb_mark_last_busy(acm->dev);
340 341 retval = usb_submit_urb(urb, GFP_ATOMIC);
341 342 if (retval)
342 343 dev_err(&urb->dev->dev, "%s - usb_submit_urb failed with "