From: Peter Zijlstra <peterz@infradead.org>
To: x86@kernel.org, mathias.nyman@linux.intel.com,
gregkh@linuxfoundation.org
Cc: linux-kernel@vger.kernel.org, peterz@infradead.org,
rdunlap@infradead.org, linux-usb@vger.kernel.org
Subject: [PATCH 3/3] usb: early: xhci-dbc: Fix xdbc number parsing
Date: Fri, 04 Mar 2022 16:19:56 +0100 [thread overview]
Message-ID: <20220304152136.035911620@infradead.org> (raw)
In-Reply-To: 20220304151953.830111479@infradead.org
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.
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
---
drivers/usb/early/xhci-dbc.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
--- a/drivers/usb/early/xhci-dbc.c
+++ b/drivers/usb/early/xhci-dbc.c
@@ -603,6 +603,7 @@ int __init early_xdbc_parse_parameter(ch
{
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(ch
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);
next prev parent reply other threads:[~2022-03-04 15:22 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-04 15:19 [PATCH 0/3] x86: Make XDBC work Peter Zijlstra
2022-03-04 15:19 ` [PATCH 1/3] x86/tsc: Be consistent about use_tsc_delay() Peter Zijlstra
2022-03-04 15:19 ` [PATCH 2/3] usb: early: xhci-dbc: Remove duplicate keep parsing Peter Zijlstra
2022-03-04 15:19 ` Peter Zijlstra [this message]
2022-03-08 10:01 ` [PATCH 3/3] usb: early: xhci-dbc: Fix xdbc number parsing Mathias Nyman
2022-04-20 3:14 ` [PATCH 0/3] x86: Make XDBC work Randy Dunlap
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220304152136.035911620@infradead.org \
--to=peterz@infradead.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=mathias.nyman@linux.intel.com \
--cc=rdunlap@infradead.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox