From: Peter Zijlstra Date: Fri, 4 Mar 2022 15:19:56 +0000 (+0100) Subject: usb: early: xhci-dbc: Fix xdbc number parsing X-Git-Tag: xarray-5.18a~184^2~17 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=298ac860af9a0b604bcf06749a6acbd07548db99;p=users%2Fwilly%2Fxarray.git usb: early: xhci-dbc: Fix xdbc number parsing kstrtoul() assumes the string contains the number only and is \0 terminated, this is not the case, as such things like: earlyprintk=xdbc1,keep go completely sideways. Use simple_strtoul() instead. Acked-by: Mathias Nyman Signed-off-by: Peter Zijlstra (Intel) Link: https://lore.kernel.org/r/20220304152136.035911620@infradead.org Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/usb/early/xhci-dbc.c b/drivers/usb/early/xhci-dbc.c index 100a45d26b5a..bfb7e2b85299 100644 --- a/drivers/usb/early/xhci-dbc.c +++ b/drivers/usb/early/xhci-dbc.c @@ -603,6 +603,7 @@ int __init early_xdbc_parse_parameter(char *s, int keep_early) { unsigned long dbgp_num = 0; u32 bus, dev, func, offset; + char *e; int ret; if (!early_pci_allowed()) @@ -613,8 +614,11 @@ int __init early_xdbc_parse_parameter(char *s, int keep_early) if (xdbc.xdbc_reg) return 0; - if (*s && kstrtoul(s, 0, &dbgp_num)) - dbgp_num = 0; + if (*s) { + dbgp_num = simple_strtoul(s, &e, 10); + if (s == e) + dbgp_num = 0; + } pr_notice("dbgp_num: %lu\n", dbgp_num);