From: YueHaibing <yuehaibing@huawei.com>
To: <tyhicks@canonical.com>, <viro@zeniv.linux.org.uk>
Cc: <linux-kernel@vger.kernel.org>, <ecryptfs@vger.kernel.org>
Subject: Re: [PATCH 1/4] ecryptfs: remove unnessesary null check in ecryptfs_keyring_auth_tok_for_sig
Date: Mon, 27 May 2019 21:22:53 +0800 [thread overview]
Message-ID: <193c19d5-94df-de12-49a0-878c434a9069@huawei.com> (raw)
In-Reply-To: <20190527131559.16088-1-yuehaibing@huawei.com>
Pls ignore this, will fix patch title
On 2019/5/27 21:15, YueHaibing wrote:
> request_key and ecryptfs_get_encrypted_key never
> return a NULL pointer, so no need do a null check.
>
> Signed-off-by: YueHaibing <yuehaibing@huawei.com>
> ---
> fs/ecryptfs/keystore.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/fs/ecryptfs/keystore.c b/fs/ecryptfs/keystore.c
> index 95662fd46b1d..a1afb162b9d2 100644
> --- a/fs/ecryptfs/keystore.c
> +++ b/fs/ecryptfs/keystore.c
> @@ -1626,9 +1626,9 @@ int ecryptfs_keyring_auth_tok_for_sig(struct key **auth_tok_key,
> int rc = 0;
>
> (*auth_tok_key) = request_key(&key_type_user, sig, NULL);
> - if (!(*auth_tok_key) || IS_ERR(*auth_tok_key)) {
> + if (IS_ERR(*auth_tok_key)) {
> (*auth_tok_key) = ecryptfs_get_encrypted_key(sig);
> - if (!(*auth_tok_key) || IS_ERR(*auth_tok_key)) {
> + if (IS_ERR(*auth_tok_key)) {
> printk(KERN_ERR "Could not find key with description: [%s]\n",
> sig);
> rc = process_request_key_err(PTR_ERR(*auth_tok_key));
>
prev parent reply other threads:[~2019-05-27 13:22 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-27 13:15 YueHaibing
2019-05-27 13:22 ` YueHaibing [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=193c19d5-94df-de12-49a0-878c434a9069@huawei.com \
--to=yuehaibing@huawei.com \
--cc=ecryptfs@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=tyhicks@canonical.com \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®