linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Rusty Russell <rusty@rustcorp.com.au>
To: Amos Kong <akong@redhat.com>,
	virtualization@lists.linux-foundation.org, kvm@vger.kernel.org,
	herbert@gondor.apana.org.au, m@bues.ch, mb@bu3sch.de,
	mpm@selenic.com, amit.shah@redhat.com,
	linux-kernel@vger.kernel.org
Cc: Rusty Russell <rusty@rustcorp.com.au>
Subject: [PATCH 4/5] hw_random: don't double-check old_rng.
Date: Thu, 18 Sep 2014 12:18:25 +0930	[thread overview]
Message-ID: <1411008506-28349-4-git-send-email-rusty@rustcorp.com.au> (raw)
In-Reply-To: <1411008506-28349-1-git-send-email-rusty@rustcorp.com.au>

Interesting anti-pattern.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
---
 drivers/char/hw_random/core.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/char/hw_random/core.c b/drivers/char/hw_random/core.c
index b4a21e9521cf..6a34feca6b43 100644
--- a/drivers/char/hw_random/core.c
+++ b/drivers/char/hw_random/core.c
@@ -472,14 +472,13 @@ int hwrng_register(struct hwrng *rng)
 	}
 
 	old_rng = current_rng;
+	err = 0;
 	if (!old_rng) {
 		err = hwrng_init(rng);
 		if (err)
 			goto out_unlock;
 		set_current_rng(rng);
-	}
-	err = 0;
-	if (!old_rng) {
+
 		err = register_miscdev();
 		if (err) {
 			drop_current_rng();
-- 
1.9.1


  parent reply	other threads:[~2014-09-18  2:53 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-09-15 16:02 [PATCH v2 0/3] fix stuck in accessing hwrng attributes Amos Kong
2014-09-15 16:02 ` [PATCH v2 1/3] virtio-rng cleanup: move some code out of mutex protection Amos Kong
2014-09-15 16:13   ` Michael Büsch
2014-09-16  0:30     ` Amos Kong
2014-09-15 16:02 ` [PATCH v2 2/3] hw_random: fix stuck in catting hwrng attributes Amos Kong
2014-09-18  2:43   ` Rusty Russell
2014-09-18  2:48     ` [PATCH 1/5] hw_random: place mutex around read functions and buffers Rusty Russell
2014-09-18  2:48       ` [PATCH 2/5] hw_random: use reference counts on each struct hwrng Rusty Russell
2014-09-18 12:22         ` Amos Kong
2014-09-18  2:48       ` [PATCH 3/5] hw_random: fix unregister race Rusty Russell
2014-10-21 14:15         ` Herbert Xu
2014-11-03 15:24           ` Amos Kong
2014-09-18  2:48       ` Rusty Russell [this message]
2014-09-18  2:48       ` [PATCH 5/5] hw_random: don't init list element we're about to add to list Rusty Russell
2014-09-18 12:47     ` [PATCH v2 2/3] hw_random: fix stuck in catting hwrng attributes Amos Kong
2014-09-15 16:02 ` [PATCH v2 3/3] hw_random: increase schedule timeout in rng_dev_read() Amos Kong
2014-09-15 16:13   ` Michael Büsch
2014-09-16  0:27     ` Amos Kong
2014-09-16 15:01       ` Michael Büsch
2014-09-17  9:30 ` [PATCH v2 0/3] fix stuck in accessing hwrng attributes Herbert Xu

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=1411008506-28349-4-git-send-email-rusty@rustcorp.com.au \
    --to=rusty@rustcorp.com.au \
    --cc=akong@redhat.com \
    --cc=amit.shah@redhat.com \
    --cc=herbert@gondor.apana.org.au \
    --cc=kvm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=m@bues.ch \
    --cc=mb@bu3sch.de \
    --cc=mpm@selenic.com \
    --cc=virtualization@lists.linux-foundation.org \
    /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).