Skip to content

Commit 90c4d05

Browse files
zenczykowskigregkh
authored andcommitted
usb: fix various gadgets null ptr deref on 10gbps cabling.
This avoids a null pointer dereference in f_{ecm,eem,hid,loopback,printer,rndis,serial,sourcesink,subset,tcm} by simply reusing the 5gbps config for 10gbps. Fixes: eaef50c ("usb: gadget: Update usb_assign_descriptors for SuperSpeedPlus") Cc: Christophe JAILLET <[email protected]> Cc: Felipe Balbi <[email protected]> Cc: Gustavo A. R. Silva <[email protected]> Cc: Lorenzo Colitti <[email protected]> Cc: Martin K. Petersen <[email protected]> Cc: Michael R Sweet <[email protected]> Cc: Mike Christie <[email protected]> Cc: Pawel Laszczak <[email protected]> Cc: Peter Chen <[email protected]> Cc: Sudhakar Panneerselvam <[email protected]> Cc: Wei Ming Chen <[email protected]> Cc: Will McVicker <[email protected]> Cc: Zqiang <[email protected]> Reviewed-By: Lorenzo Colitti <[email protected]> Cc: stable <[email protected]> Signed-off-by: Maciej Żenczykowski <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent d165826 commit 90c4d05

File tree

10 files changed

+14
-10
lines changed

10 files changed

+14
-10
lines changed

drivers/usb/gadget/function/f_ecm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -791,7 +791,7 @@ ecm_bind(struct usb_configuration *c, struct usb_function *f)
791791
fs_ecm_notify_desc.bEndpointAddress;
792792

793793
status = usb_assign_descriptors(f, ecm_fs_function, ecm_hs_function,
794-
ecm_ss_function, NULL);
794+
ecm_ss_function, ecm_ss_function);
795795
if (status)
796796
goto fail;
797797

drivers/usb/gadget/function/f_eem.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ static int eem_bind(struct usb_configuration *c, struct usb_function *f)
302302
eem_ss_out_desc.bEndpointAddress = eem_fs_out_desc.bEndpointAddress;
303303

304304
status = usb_assign_descriptors(f, eem_fs_function, eem_hs_function,
305-
eem_ss_function, NULL);
305+
eem_ss_function, eem_ss_function);
306306
if (status)
307307
goto fail;
308308

drivers/usb/gadget/function/f_hid.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -802,7 +802,8 @@ static int hidg_bind(struct usb_configuration *c, struct usb_function *f)
802802
hidg_fs_out_ep_desc.bEndpointAddress;
803803

804804
status = usb_assign_descriptors(f, hidg_fs_descriptors,
805-
hidg_hs_descriptors, hidg_ss_descriptors, NULL);
805+
hidg_hs_descriptors, hidg_ss_descriptors,
806+
hidg_ss_descriptors);
806807
if (status)
807808
goto fail;
808809

drivers/usb/gadget/function/f_loopback.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ static int loopback_bind(struct usb_configuration *c, struct usb_function *f)
207207
ss_loop_sink_desc.bEndpointAddress = fs_loop_sink_desc.bEndpointAddress;
208208

209209
ret = usb_assign_descriptors(f, fs_loopback_descs, hs_loopback_descs,
210-
ss_loopback_descs, NULL);
210+
ss_loopback_descs, ss_loopback_descs);
211211
if (ret)
212212
return ret;
213213

drivers/usb/gadget/function/f_printer.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1101,7 +1101,8 @@ static int printer_func_bind(struct usb_configuration *c,
11011101
ss_ep_out_desc.bEndpointAddress = fs_ep_out_desc.bEndpointAddress;
11021102

11031103
ret = usb_assign_descriptors(f, fs_printer_function,
1104-
hs_printer_function, ss_printer_function, NULL);
1104+
hs_printer_function, ss_printer_function,
1105+
ss_printer_function);
11051106
if (ret)
11061107
return ret;
11071108

drivers/usb/gadget/function/f_rndis.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -789,7 +789,7 @@ rndis_bind(struct usb_configuration *c, struct usb_function *f)
789789
ss_notify_desc.bEndpointAddress = fs_notify_desc.bEndpointAddress;
790790

791791
status = usb_assign_descriptors(f, eth_fs_function, eth_hs_function,
792-
eth_ss_function, NULL);
792+
eth_ss_function, eth_ss_function);
793793
if (status)
794794
goto fail;
795795

drivers/usb/gadget/function/f_serial.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ static int gser_bind(struct usb_configuration *c, struct usb_function *f)
233233
gser_ss_out_desc.bEndpointAddress = gser_fs_out_desc.bEndpointAddress;
234234

235235
status = usb_assign_descriptors(f, gser_fs_function, gser_hs_function,
236-
gser_ss_function, NULL);
236+
gser_ss_function, gser_ss_function);
237237
if (status)
238238
goto fail;
239239
dev_dbg(&cdev->gadget->dev, "generic ttyGS%d: %s speed IN/%s OUT/%s\n",

drivers/usb/gadget/function/f_sourcesink.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,8 @@ sourcesink_bind(struct usb_configuration *c, struct usb_function *f)
431431
ss_iso_sink_desc.bEndpointAddress = fs_iso_sink_desc.bEndpointAddress;
432432

433433
ret = usb_assign_descriptors(f, fs_source_sink_descs,
434-
hs_source_sink_descs, ss_source_sink_descs, NULL);
434+
hs_source_sink_descs, ss_source_sink_descs,
435+
ss_source_sink_descs);
435436
if (ret)
436437
return ret;
437438

drivers/usb/gadget/function/f_subset.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ geth_bind(struct usb_configuration *c, struct usb_function *f)
358358
fs_subset_out_desc.bEndpointAddress;
359359

360360
status = usb_assign_descriptors(f, fs_eth_function, hs_eth_function,
361-
ss_eth_function, NULL);
361+
ss_eth_function, ss_eth_function);
362362
if (status)
363363
goto fail;
364364

drivers/usb/gadget/function/f_tcm.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2057,7 +2057,8 @@ static int tcm_bind(struct usb_configuration *c, struct usb_function *f)
20572057
uasp_fs_cmd_desc.bEndpointAddress = uasp_ss_cmd_desc.bEndpointAddress;
20582058

20592059
ret = usb_assign_descriptors(f, uasp_fs_function_desc,
2060-
uasp_hs_function_desc, uasp_ss_function_desc, NULL);
2060+
uasp_hs_function_desc, uasp_ss_function_desc,
2061+
uasp_ss_function_desc);
20612062
if (ret)
20622063
goto ep_fail;
20632064

0 commit comments

Comments
 (0)