From: Lars Ellenberg <lars.ellenberg@linbit.com>
To: Insu Yun <wuninsu@gmail.com>
Cc: philipp.reisner@linbit.com, drbd-dev@lists.linbit.com,
linux-kernel@vger.kernel.org, taesoo@gatech.edu,
yeongjin.jang@gatech.edu, insu@gatech.edu, changwoo@gatech.edu
Subject: Re: [PATCH] drbd: correctly handling failed crypto_alloc_hash
Date: Tue, 16 Feb 2016 10:08:51 +0100 [thread overview]
Message-ID: <20160216090851.GS29699@soda.linbit> (raw)
In-Reply-To: <1455589585-7275-1-git-send-email-wuninsu@gmail.com>
On Mon, Feb 15, 2016 at 09:26:25PM -0500, Insu Yun wrote:
> crypto_alloc_hash returns an error code, not NULL.
You are correct, of course. Was broken since its introduction
five years ago. Strange though, we have a helper function further
down in that file, and other, even much older, call sites as well,
which are doing the IS_ERR() correctly.
Apparently no-one ever requested a non-supported alg.
> Signed-off-by: Insu Yun <wuninsu@gmail.com>
> ---
> drivers/block/drbd/drbd_receiver.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
> index 1957fe8..9063462 100644
> --- a/drivers/block/drbd/drbd_receiver.c
> +++ b/drivers/block/drbd/drbd_receiver.c
> @@ -3403,7 +3403,7 @@ static int receive_protocol(struct drbd_connection *connection, struct packet_in
> */
>
> peer_integrity_tfm = crypto_alloc_hash(integrity_alg, 0, CRYPTO_ALG_ASYNC);
> - if (!peer_integrity_tfm) {
> + if (IS_ERR(peer_integrity_tfm)) {
> drbd_err(connection, "peer data-integrity-alg %s not supported\n",
> integrity_alg);
> goto disconnect;
Your patch is incomplete, though:
the first action in the "disconnect" cleanup path is
crypto_free_hash(peer_integrity_tfm);
so we better make sure it is not trying to free an error pointer:
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
index c097909..6054c53 100644
--- a/drivers/block/drbd/drbd_receiver.c
+++ b/drivers/block/drbd/drbd_receiver.c
@@ -3376,7 +3376,8 @@ static int receive_protocol(struct drbd_connection *connection, struct packet_in
*/
peer_integrity_tfm = crypto_alloc_hash(integrity_alg, 0, CRYPTO_ALG_ASYNC);
- if (!peer_integrity_tfm) {
+ if (IS_ERR(peer_integrity_tfm)) {
+ peer_integrity_tfm = NULL;
drbd_err(connection, "peer data-integrity-alg %s not supported\n",
integrity_alg);
goto disconnect;
Thanks,
Lars
prev parent reply other threads:[~2016-02-16 9:15 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-16 2:26 [PATCH] drbd: correctly handling failed crypto_alloc_hash Insu Yun
2016-02-16 9:08 ` Lars Ellenberg [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=20160216090851.GS29699@soda.linbit \
--to=lars.ellenberg@linbit.com \
--cc=changwoo@gatech.edu \
--cc=drbd-dev@lists.linbit.com \
--cc=insu@gatech.edu \
--cc=linux-kernel@vger.kernel.org \
--cc=philipp.reisner@linbit.com \
--cc=taesoo@gatech.edu \
--cc=wuninsu@gmail.com \
--cc=yeongjin.jang@gatech.edu \
/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;
as well as URLs for NNTP newsgroup(s).