2020-03-27 21:25:24

by Jules Irenge

Subject: [PATCH 09/10] kernel/sysctl.c: Replace 1 and 0 by corresponding boolean value

Coccinelle reports a warning

WARNING: Assignment of 0/1 to bool variable

To fix this, values 1 and 0 of first variable
are replaced by true and false respectively.
Given that variable first is of bool type.
This fixes the warnings.

Signed-off-by: Jules Irenge <[email protected]>
---
kernel/sysctl.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index ad5b88a53c5a..4132a35e85bd 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -3158,7 +3158,7 @@ int proc_do_large_bitmap(struct ctl_table *table, int write,
void __user *buffer, size_t *lenp, loff_t *ppos)
{
int err = 0;
- bool first = 1;
+ bool first = true;
size_t left = *lenp;
unsigned long bitmap_len = table->maxlen;
unsigned long *bitmap = *(unsigned long **) table->data;
@@ -3249,7 +3249,7 @@ int proc_do_large_bitmap(struct ctl_table *table, int write,
}

bitmap_set(tmp_bitmap, val_a, val_b - val_a + 1);
- first = 0;
+ first = false;
proc_skip_char(&p, &left, '\n');
}
kfree(kbuf);
@@ -3281,7 +3281,7 @@ int proc_do_large_bitmap(struct ctl_table *table, int write,
break;
}

- first = 0; bit_b++;
+ first = false; bit_b++;
}
if (!err)
err = proc_put_char(&buffer, &left, '\n');
--
2.25.1

2020-03-28 21:26:38

by Kees Cook

Subject: Re: [PATCH 09/10] kernel/sysctl.c: Replace 1 and 0 by corresponding boolean value

On Fri, Mar 27, 2020 at 09:23:56PM +0000, Jules Irenge wrote:
> Coccinelle reports a warning
>
> WARNING: Assignment of 0/1 to bool variable
>
> To fix this, values 1 and 0 of first variable
> are replaced by true and false respectively.
> Given that variable first is of bool type.
> This fixes the warnings.

Sure! Thanks. :)

> Signed-off-by: Jules Irenge <[email protected]>

Reviewed-by: Kees Cook <[email protected]>

-Kees

> ---
> kernel/sysctl.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/kernel/sysctl.c b/kernel/sysctl.c
> index ad5b88a53c5a..4132a35e85bd 100644
> --- a/kernel/sysctl.c
> +++ b/kernel/sysctl.c
> @@ -3158,7 +3158,7 @@ int proc_do_large_bitmap(struct ctl_table *table, int write,
> void __user *buffer, size_t *lenp, loff_t *ppos)
> {
> int err = 0;
> - bool first = 1;
> + bool first = true;
> size_t left = *lenp;
> unsigned long bitmap_len = table->maxlen;
> unsigned long *bitmap = *(unsigned long **) table->data;
> @@ -3249,7 +3249,7 @@ int proc_do_large_bitmap(struct ctl_table *table, int write,
> }
>
> bitmap_set(tmp_bitmap, val_a, val_b - val_a + 1);
> - first = 0;
> + first = false;
> proc_skip_char(&p, &left, '\n');
> }
> kfree(kbuf);
> @@ -3281,7 +3281,7 @@ int proc_do_large_bitmap(struct ctl_table *table, int write,
> break;
> }
>
> - first = 0; bit_b++;
> + first = false; bit_b++;
> }
> if (!err)
> err = proc_put_char(&buffer, &left, '\n');
> --
> 2.25.1
>

--
Kees Cook