Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit a7a4f1c1a52912eb8b3bd4d8f628d83a8b5d69dd

Authored by Andy Shevchenko
Committed by David S. Miller
1 parent fb8621bb6c
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

drivers: isdn: capi: use simple_strtol to convert numbers 

Signed-off-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Cc: Karsten Keil <isdn@linux-pingi.de>
Cc: Tilman Schmidt <tilman@imap.cc>
Cc: netdev@vger.kernel.org
Signed-off-by: David S. Miller <davem@davemloft.net>

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

drivers/isdn/capi/capidrv.c
Diff comments   View file @ a7a4f1c
... ... @@ -1515,8 +1515,13 @@
1515 1515 while (*s) {
1516 1516 int digit1 = 0;
1517 1517 int digit2 = 0;
1518   - if (!isdigit(*s)) return -3;
1519   - while (isdigit(*s)) { digit1 = digit1*10 + (*s - '0'); s++; }
  1518 + char *endp;
  1519 +
  1520 + digit1 = simple_strtoul(s, &endp, 10);
  1521 + if (s == endp)
  1522 + return -3;
  1523 + s = endp;
  1524 +
1520 1525 if (digit1 <= 0 || digit1 > 30) return -4;
1521 1526 if (*s == 0 || *s == ',' || *s == ' ') {
1522 1527 bmask |= (1 << digit1);
... ... @@ -1526,8 +1531,12 @@
1526 1531 }
1527 1532 if (*s != '-') return -5;
1528 1533 s++;
1529   - if (!isdigit(*s)) return -3;
1530   - while (isdigit(*s)) { digit2 = digit2*10 + (*s - '0'); s++; }
  1534 +
  1535 + digit2 = simple_strtoul(s, &endp, 10);
  1536 + if (s == endp)
  1537 + return -3;
  1538 + s = endp;
  1539 +
1531 1540 if (digit2 <= 0 || digit2 > 30) return -4;
1532 1541 if (*s == 0 || *s == ',' || *s == ' ') {
1533 1542 if (digit1 > digit2)