Skip to content

Commit 85df0d5

Browse files
Su Huiakpm00
authored andcommitted
ocfs2: replace simple_strtol with kstrtol
kstrtol() is better because simple_strtol() ignores overflow. And using kstrtol() is more concise. Link: https://lkml.kernel.org/r/[email protected] Signed-off-by: Su Hui <[email protected]> Reviewed-by: Joseph Qi <[email protected]> Cc: Mark Fasheh <[email protected]> Cc: Joel Becker <[email protected]> Cc: Junxiao Bi <[email protected]> Cc: Changwei Ge <[email protected]> Cc: Jun Piao <[email protected]> Signed-off-by: Andrew Morton <[email protected]>
1 parent 50b4233 commit 85df0d5

File tree

1 file changed

+4
-11
lines changed

1 file changed

+4
-11
lines changed

fs/ocfs2/stack_user.c

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,6 @@ static int ocfs2_control_do_setnode_msg(struct file *file,
360360
struct ocfs2_control_message_setn *msg)
361361
{
362362
long nodenum;
363-
char *ptr = NULL;
364363
struct ocfs2_control_private *p = file->private_data;
365364

366365
if (ocfs2_control_get_handshake_state(file) !=
@@ -375,8 +374,7 @@ static int ocfs2_control_do_setnode_msg(struct file *file,
375374
return -EINVAL;
376375
msg->space = msg->newline = '\0';
377376

378-
nodenum = simple_strtol(msg->nodestr, &ptr, 16);
379-
if (!ptr || *ptr)
377+
if (kstrtol(msg->nodestr, 16, &nodenum))
380378
return -EINVAL;
381379

382380
if ((nodenum == LONG_MIN) || (nodenum == LONG_MAX) ||
@@ -391,7 +389,6 @@ static int ocfs2_control_do_setversion_msg(struct file *file,
391389
struct ocfs2_control_message_setv *msg)
392390
{
393391
long major, minor;
394-
char *ptr = NULL;
395392
struct ocfs2_control_private *p = file->private_data;
396393
struct ocfs2_protocol_version *max =
397394
&ocfs2_user_plugin.sp_max_proto;
@@ -409,11 +406,9 @@ static int ocfs2_control_do_setversion_msg(struct file *file,
409406
return -EINVAL;
410407
msg->space1 = msg->space2 = msg->newline = '\0';
411408

412-
major = simple_strtol(msg->major, &ptr, 16);
413-
if (!ptr || *ptr)
409+
if (kstrtol(msg->major, 16, &major))
414410
return -EINVAL;
415-
minor = simple_strtol(msg->minor, &ptr, 16);
416-
if (!ptr || *ptr)
411+
if (kstrtol(msg->minor, 16, &minor))
417412
return -EINVAL;
418413

419414
/*
@@ -441,7 +436,6 @@ static int ocfs2_control_do_down_msg(struct file *file,
441436
struct ocfs2_control_message_down *msg)
442437
{
443438
long nodenum;
444-
char *p = NULL;
445439

446440
if (ocfs2_control_get_handshake_state(file) !=
447441
OCFS2_CONTROL_HANDSHAKE_VALID)
@@ -456,8 +450,7 @@ static int ocfs2_control_do_down_msg(struct file *file,
456450
return -EINVAL;
457451
msg->space1 = msg->space2 = msg->newline = '\0';
458452

459-
nodenum = simple_strtol(msg->nodestr, &p, 16);
460-
if (!p || *p)
453+
if (kstrtol(msg->nodestr, 16, &nodenum))
461454
return -EINVAL;
462455

463456
if ((nodenum == LONG_MIN) || (nodenum == LONG_MAX) ||

0 commit comments

Comments
 (0)