linux-kernel - Re: [PATCH] proc: potential ERR_PTR dereference on proc_fill

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]

Message-ID: <8738d3hfm4.fsf@x220.int.ebiederm.org>
Date:	Sun, 10 Aug 2014 20:25:39 -0700
From:	ebiederm@...ssion.com (Eric W. Biederman)
To:	Daeseok Youn <daeseok.youn@...il.com>
Cc:	akpm@...ux-foundation.org, oleg@...hat.com, eparis@...hat.com,
	rgb@...hat.com, tixxdz@...ndz.org, adobriyan@...il.com,
	bill.c.roberts@...il.com, linux-kernel@...r.kernel.org
Subject: Re: [PATCH] proc: potential ERR_PTR dereference on proc_fill_cache()

Daeseok Youn <daeseok.youn@...il.com> writes:

> The d_hash_and_lookup() returns NULL or ERR_PTR on lookup
> failure.

Given that the only error condition can come from .d_hash and that proc
does not implement .d_hash if we want to do something with error returns
let's call BUG_ON. aka:

diff --git a/fs/proc/base.c b/fs/proc/base.c
index f50d4be..49bc09c 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -1673,7 +1673,7 @@ bool proc_fill_cache(struct file *file, struct dir_context *ctx,
 	ino_t ino;
 
 	child = d_hash_and_lookup(dir, &qname);
+	BUG_ON(IS_ERR(child))
	if (!child) {
 		child = d_alloc(dir, &qname);
 		if (!child)
 			goto end_instantiate;

Or do you see something in d_hash_and_lookup that I am overlooking?

Eric


> Signed-off-by: Daeseok Youn <daeseok.youn@...il.com>
> ---
>  fs/proc/base.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/fs/proc/base.c b/fs/proc/base.c
> index f50d4be..49bc09c 100644
> --- a/fs/proc/base.c
> +++ b/fs/proc/base.c
> @@ -1673,7 +1673,7 @@ bool proc_fill_cache(struct file *file, struct dir_context *ctx,
>  	ino_t ino;
>  
>  	child = d_hash_and_lookup(dir, &qname);
> -	if (!child) {
> +	if (IS_ERR_OR_NULL(child)) {
>  		child = d_alloc(dir, &qname);
>  		if (!child)
>  			goto end_instantiate;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/