linux-kernel - Re: [PATCH v2] ceph: remove unnecessary check for NULL in parse

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] [day] [month] [year] [list]

Message-ID: <68cb338c-f293-b69a-06f1-fc54b3be1933@redhat.com>
Date:   Mon, 11 Sep 2023 09:14:42 +0800
From:   Xiubo Li <xiubli@...hat.com>
To:     Luís Henriques <lhenriques@...e.de>,
        Ilya Dryomov <idryomov@...il.com>,
        Jeff Layton <jlayton@...nel.org>,
        Milind Changire <mchangir@...hat.com>
Cc:     ceph-devel@...r.kernel.org, linux-kernel@...r.kernel.org,
        Dan Carpenter <dan.carpenter@...aro.org>
Subject: Re: [PATCH v2] ceph: remove unnecessary check for NULL in
 parse_longname()


On 9/8/23 19:20, Luís Henriques wrote:
> Function ceph_get_inode() never returns NULL; instead it returns an
> ERR_PTR() if something fails.  Thus, the check for NULL in parse_longname()
> is useless and can be dropped.  Instead, move there the debug code that
> does the error checking so that it's only executed if ceph_get_inode() is
> called.
>
> Fixes: dd66df0053ef ("ceph: add support for encrypted snapshot names")
> Reported-by: Dan Carpenter <dan.carpenter@...aro.org>
> Signed-off-by: Luís Henriques <lhenriques@...e.de>
> ---
> Changes since v2:
> As suggested by Xiubo, moved the error checking into the 'if (!dir)'
> block.
>
>   fs/ceph/crypto.c | 6 ++----
>   1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/fs/ceph/crypto.c b/fs/ceph/crypto.c
> index e4d5cd56a80b..e1f31b86fd48 100644
> --- a/fs/ceph/crypto.c
> +++ b/fs/ceph/crypto.c
> @@ -249,11 +249,9 @@ static struct inode *parse_longname(const struct inode *parent,
>   	if (!dir) {
>   		/* This can happen if we're not mounting cephfs on the root */
>   		dir = ceph_get_inode(parent->i_sb, vino, NULL);
> -		if (!dir)
> -			dir = ERR_PTR(-ENOENT);
> +		if (IS_ERR(dir))
> +			dout("Can't find inode %s (%s)\n", inode_number, name);
>   	}
> -	if (IS_ERR(dir))
> -		dout("Can't find inode %s (%s)\n", inode_number, name);
>   
>   out:
>   	kfree(inode_number);
>
LGTM.

Applied to the testing branch and will run the tests.

Thanks Luis.