From: Amos Kong <akong@redhat.com>
To: "Michael Büsch" <m@bues.ch>
Cc: virtualization@lists.linux-foundation.org, kvm@vger.kernel.org,
herbert@gondor.apana.org.au, mpm@selenic.com,
rusty@rustcorp.com.au, amit.shah@redhat.com,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2 1/3] virtio-rng cleanup: move some code out of mutex protection
Date: Tue, 16 Sep 2014 08:30:31 +0800 [thread overview]
Message-ID: <20140916003031.GB5671@zen> (raw)
In-Reply-To: <20140915181320.28f642d6@wiggum>
[-- Attachment #1: Type: text/plain, Size: 1867 bytes --]
On Mon, Sep 15, 2014 at 06:13:20PM +0200, Michael Büsch wrote:
> On Tue, 16 Sep 2014 00:02:27 +0800
> Amos Kong <akong@redhat.com> wrote:
>
> > It doesn't save too much cpu time as expected, just a cleanup.
> >
> > Signed-off-by: Amos Kong <akong@redhat.com>
> > ---
> > drivers/char/hw_random/core.c | 6 +++---
> > 1 file changed, 3 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/char/hw_random/core.c b/drivers/char/hw_random/core.c
> > index aa30a25..c591d7e 100644
> > --- a/drivers/char/hw_random/core.c
> > +++ b/drivers/char/hw_random/core.c
> > @@ -270,8 +270,8 @@ static ssize_t hwrng_attr_current_show(struct device *dev,
> > return -ERESTARTSYS;
> > if (current_rng)
> > name = current_rng->name;
> > - ret = snprintf(buf, PAGE_SIZE, "%s\n", name);
> > mutex_unlock(&rng_mutex);
> > + ret = snprintf(buf, PAGE_SIZE, "%s\n", name);
>
> I'm not sure this is safe.
> Name is just a pointer.
> What if the hwrng gets unregistered after unlock and just before the snprintf?
Oh, it points to protected current_rng->name, I will drop this
cleanup. Thanks.
> > return ret;
> > }
> > @@ -284,19 +284,19 @@ static ssize_t hwrng_attr_available_show(struct device *dev,
> > ssize_t ret = 0;
> > struct hwrng *rng;
> >
> > + buf[0] = '\0';
> > err = mutex_lock_interruptible(&rng_mutex);
> > if (err)
> > return -ERESTARTSYS;
> > - buf[0] = '\0';
> > list_for_each_entry(rng, &rng_list, list) {
> > strncat(buf, rng->name, PAGE_SIZE - ret - 1);
> > ret += strlen(rng->name);
> > strncat(buf, " ", PAGE_SIZE - ret - 1);
> > ret++;
> > }
> > + mutex_unlock(&rng_mutex);
> > strncat(buf, "\n", PAGE_SIZE - ret - 1);
> > ret++;
> > - mutex_unlock(&rng_mutex);
> >
> > return ret;
> > }
>
> This looks ok.
>
> --
> Michael
--
Amos.
[-- Attachment #2: Type: application/pgp-signature, Size: 819 bytes --]
next prev parent reply other threads:[~2014-09-16 0:32 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 [this message]
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 ` [PATCH 4/5] hw_random: don't double-check old_rng Rusty Russell
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=20140916003031.GB5671@zen \
--to=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=mpm@selenic.com \
--cc=rusty@rustcorp.com.au \
--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).