iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

IB/srp: Use kstrtoull() instead of simple_strtoull()

Browse Source 
Use kstrtoull() since simple_strtoull() is deprecated. This patch
improves error checking but otherwise does not change any functionality.

Signed-off-by: Bart Van Assche <bart.vanassche@wdc.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
This commit is contained in:
Bart Van Assche 2018-01-16 10:39:42 -08:00 committed by Doug Ledford
parent 0b5fe5c43a
commit 2a174df0c6
1 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
drivers/infiniband/ulp/srp/ib_srp.c
View File

@ -3111,6 +3111,7 @@ static int srp_parse_options(const char *buf, struct srp_target_port *target)
char *options, *sep_opt; char *options, *sep_opt;
char *p; char *p;
substring_t args[MAX_OPT_ARGS]; substring_t args[MAX_OPT_ARGS];
unsigned long long ull;
int opt_mask = 0; int opt_mask = 0;
int token; int token;
int ret = -EINVAL; int ret = -EINVAL;
@ -3135,7 +3136,13 @@ static int srp_parse_options(const char *buf, struct srp_target_port *target)
ret = -ENOMEM; ret = -ENOMEM;
goto out; goto out;
} }
target->id_ext = cpu_to_be64(simple_strtoull(p, NULL, 16)); ret = kstrtoull(p, 16, &ull);
if (ret) {
pr_warn("invalid id_ext parameter '%s'\n", p);
kfree(p);
goto out;
}
target->id_ext = cpu_to_be64(ull);
kfree(p); kfree(p);
break; break;
@ -3145,7 +3152,13 @@ static int srp_parse_options(const char *buf, struct srp_target_port *target)
ret = -ENOMEM; ret = -ENOMEM;
goto out; goto out;
} }
target->ioc_guid = cpu_to_be64(simple_strtoull(p, NULL, 16)); ret = kstrtoull(p, 16, &ull);
if (ret) {
pr_warn("invalid ioc_guid parameter '%s'\n", p);
kfree(p);
goto out;
}
target->ioc_guid = cpu_to_be64(ull);
kfree(p); kfree(p);
break; break;
@ -3181,7 +3194,13 @@ static int srp_parse_options(const char *buf, struct srp_target_port *target)
ret = -ENOMEM; ret = -ENOMEM;
goto out; goto out;
} }
target->service_id = cpu_to_be64(simple_strtoull(p, NULL, 16)); ret = kstrtoull(p, 16, &ull);
if (ret) {
pr_warn("bad service_id parameter '%s'\n", p);
kfree(p);
goto out;
}
target->service_id = cpu_to_be64(ull);
kfree(p); kfree(p);
break; break;
@ -3235,7 +3254,13 @@ static int srp_parse_options(const char *buf, struct srp_target_port *target)
ret = -ENOMEM; ret = -ENOMEM;
goto out; goto out;
} }
target->initiator_ext = cpu_to_be64(simple_strtoull(p, NULL, 16)); ret = kstrtoull(p, 16, &ull);
if (ret) {
pr_warn("bad initiator_ext value '%s'\n", p);
kfree(p);
goto out;
}
target->initiator_ext = cpu_to_be64(ull);
kfree(p); kfree(p);
break; break;