simple_strtoul() is deprecated as it has no error checking. Replace it with kstrtouint() which returns an error code on invalid input, and add appropriate error handling. Also add a NULL check before parsing flags, since strsep() can set id to NULL if the input has fewer tokens than expected. Signed-off-by: Sajal Gupta --- drivers/net/usb/pegasus.c | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/drivers/net/usb/pegasus.c b/drivers/net/usb/pegasus.c index db85f40734d7..d45f08f8f22e 100644 --- a/drivers/net/usb/pegasus.c +++ b/drivers/net/usb/pegasus.c @@ -1327,15 +1327,29 @@ static void __init parse_id(char *id) { unsigned int vendor_id = 0, device_id = 0, flags = 0, i = 0; char *token, *name = NULL; + int err; - if ((token = strsep(&id, ":")) != NULL) + token = strsep(&id, ":"); + if (token) name = token; /* name now points to a null terminated string*/ - if ((token = strsep(&id, ":")) != NULL) - vendor_id = simple_strtoul(token, NULL, 16); - if ((token = strsep(&id, ":")) != NULL) - device_id = simple_strtoul(token, NULL, 16); - flags = simple_strtoul(id, NULL, 16); + token = strsep(&id, ":"); + if (token) { + err = kstrtouint(token, 16, &vendor_id); + if (err) + return; + } + token = strsep(&id, ":"); + if (token) { + err = kstrtouint(token, 16, &device_id); + if (err) + return; + } + if (id) { + err = kstrtouint(id, 16, &flags); + if (err) + return; + } pr_info("%s: new device %s, vendor ID 0x%04x, device ID 0x%04x, flags: 0x%x\n", driver_name, name, vendor_id, device_id, flags); -- 2.54.0