diff options
| author | Satoru Moriya <satoru.moriya@hds.com> | 2011-05-27 01:38:04 +0200 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2011-07-24 14:36:03 +0200 |
| commit | 81c7413650fbbf881bcb9e567be61a6717eb1876 (patch) | |
| tree | 4e09dc38195e016c983f1aa9430ace78487cb178 /kernel/params.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vap... (diff) | |
| download | linux-81c7413650fbbf881bcb9e567be61a6717eb1876.tar.xz linux-81c7413650fbbf881bcb9e567be61a6717eb1876.zip | |
param: fix return value handling in param_set_*
In STANDARD_PARAM_DEF, param_set_* handles the case in which strtolfn
returns -EINVAL but it may return -ERANGE. If it returns -ERANGE,
param_set_* may set uninitialized value to the paramerter. We should handle
both cases.
The one of the cases in which strtolfn() returns -ERANGE is following:
*Type of module parameter is long
*Set the parameter more than LONG_MAX
Signed-off-by: Satoru Moriya <satoru.moriya@hds.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to '')
| -rw-r--r-- | kernel/params.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/params.c b/kernel/params.c index ed72e1330862..2a4ba258f04f 100644 --- a/kernel/params.c +++ b/kernel/params.c @@ -225,8 +225,8 @@ int parse_args(const char *name, int ret; \ \ ret = strtolfn(val, 0, &l); \ - if (ret == -EINVAL || ((type)l != l)) \ - return -EINVAL; \ + if (ret < 0 || ((type)l != l)) \ + return ret < 0 ? ret : -EINVAL; \ *((type *)kp->arg) = l; \ return 0; \ } \ |