diff mbox

sysctl: remove duplicate UINT_MAX check on do_proc_douintvec_conv()

Message ID 20170919072918.12066-1-mcgrof@kernel.org
State New, archived
Headers show

Commit Message

Luis Chamberlain Sept. 19, 2017, 7:29 a.m. UTC
do_proc_douintvec_conv() has two UINT_MAX checks, we can remove one.
This has no functional changes other than fixing a compiler warning:

kernel/sysctl.c:2190]: (warning) Identical condition '*lvalp>UINT_MAX', second condition is always false

Reported-by: David Binderman <dcb314@hotmail.com>
Signed-off-by: Luis R. Rodriguez <mcgrof@kernel.org>
---
 kernel/sysctl.c | 2 --
 1 file changed, 2 deletions(-)

Comments

Kees Cook Sept. 19, 2017, 9:52 p.m. UTC | #1
On Tue, Sep 19, 2017 at 12:29 AM, Luis R. Rodriguez <mcgrof@kernel.org> wrote:
> do_proc_douintvec_conv() has two UINT_MAX checks, we can remove one.
> This has no functional changes other than fixing a compiler warning:
>
> kernel/sysctl.c:2190]: (warning) Identical condition '*lvalp>UINT_MAX', second condition is always false
>
> Reported-by: David Binderman <dcb314@hotmail.com>
> Signed-off-by: Luis R. Rodriguez <mcgrof@kernel.org>

Fixes: 4f2fec00afa60 ("sysctl: simplify unsigned int support")
Acked-by: Kees Cook <keescook@chromium.org>

-Kees

> ---
>  kernel/sysctl.c | 2 --
>  1 file changed, 2 deletions(-)
>
> diff --git a/kernel/sysctl.c b/kernel/sysctl.c
> index 4c08ed4a379e..0da31bbbff18 100644
> --- a/kernel/sysctl.c
> +++ b/kernel/sysctl.c
> @@ -2181,8 +2181,6 @@ static int do_proc_douintvec_conv(unsigned long *lvalp,
>                                   int write, void *data)
>  {
>         if (write) {
> -               if (*lvalp > UINT_MAX)
> -                       return -EINVAL;
>                 if (*lvalp > UINT_MAX)
>                         return -EINVAL;
>                 *valp = *lvalp;
> --
> 2.14.0
>
diff mbox

Patch

diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 4c08ed4a379e..0da31bbbff18 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -2181,8 +2181,6 @@  static int do_proc_douintvec_conv(unsigned long *lvalp,
 				  int write, void *data)
 {
 	if (write) {
-		if (*lvalp > UINT_MAX)
-			return -EINVAL;
 		if (*lvalp > UINT_MAX)
 			return -EINVAL;
 		*valp = *lvalp;