2011-05-26 23:38:26

by Satoru Moriya

[permalink] [raw]
Subject: [PATCH][BUGFIX] 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 <[email protected]>
---
kernel/params.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/params.c b/kernel/params.c
index ed72e13..2a4ba25 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; \
}


2011-05-30 01:36:26

by Rusty Russell

[permalink] [raw]
Subject: Re: [PATCH][BUGFIX] param: fix return value handling in param_set_*

On Thu, 26 May 2011 19:38:04 -0400, Satoru Moriya <[email protected]> wrote:
> 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 <[email protected]>

Thanks, applied.

Cheers,
Rusty.