linux-kernel - Re: [PATCH] printk: fix ifnullfree.cocci warnings

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Mon, 27 Jul 2020 15:26:33 +0206
From:   John Ogness <john.ogness@...utronix.de>
To:     Julia Lawall <julia.lawall@...ia.fr>
Cc:     Sebastian Andrzej Siewior <bigeasy@...utronix.de>,
        Petr Mladek <pmladek@...e.com>,
        Sergey Senozhatsky <sergey.senozhatsky@...il.com>,
        Steven Rostedt <rostedt@...dmis.org>,
        linux-kernel@...r.kernel.org, kbuild-all@...ts.01.org,
        linux-rt-users <linux-rt-users@...r.kernel.org>
Subject: Re: [PATCH] printk: fix ifnullfree.cocci warnings

On 2020-07-24, Julia Lawall <julia.lawall@...ia.fr> wrote:
> Make the code a little simpler by dropping
> some unneeded tests.
>
> Generated by: scripts/coccinelle/free/ifnullfree.cocci
>
> Fixes: c406fbce2054 ("printk: implement syslog")
> CC: John Ogness <john.ogness@...utronix.de>
> Signed-off-by: kernel test robot <lkp@...el.com>

This is for the rogue version of the printk ringbuffer within RT at the
moment. Until the new accepted version is mainline, we might as well
keep the RT variant maintained.

Acked-by: John Ogness <john.ogness@...utronix.de>

> ---
>
> tree:   https://git.kernel.org/pub/scm/linux/kernel/git/rt/linux-rt-devel.git linux-5.4.y-rt
> head:   5fbf1e70f11dba64cc05c9d85120a3aa7c67a4a2
> commit: c406fbce2054efbf812b3d811ed23a872f719db9 [43/325] printk: implement syslog
> :::::: branch date: 4 months ago
> :::::: commit date: 7 months ago
>
>  printk.c |   12 ++++--------
>  1 file changed, 4 insertions(+), 8 deletions(-)
>
> --- a/kernel/printk/printk.c
> +++ b/kernel/printk/printk.c
> @@ -1539,10 +1539,8 @@ static int syslog_print_all(char __user
>  	if (clear && !seq)
>  		syslog_clear();
>
> -	if (text)
> -		kfree(text);
> -	if (msgbuf)
> -		kfree(msgbuf);
> +	kfree(text);
> +	kfree(msgbuf);
>  	return len;
>  }
>
> @@ -1695,10 +1693,8 @@ int do_syslog(int type, char __user *buf
>  		break;
>  	}
>  out:
> -	if (msgbuf)
> -		kfree(msgbuf);
> -	if (text)
> -		kfree(text);
> +	kfree(msgbuf);
> +	kfree(text);
>  	return error;
>  }
>