From: Rafael Aquini <aquini@redhat.com>
To: Wei Yongjun <weiyj.lk@gmail.com>
Cc: mst@redhat.com, linux-kernel@vger.kernel.org,
virtualization@lists.linux-foundation.org,
yongjun_wei@trendmicro.com.cn, akpm@linux-foundation.org
Subject: Re: [PATCH -next] virtio: balloon: fix missing unlock on error in fill_balloon()
Date: Mon, 12 Nov 2012 12:16:54 -0200 [thread overview]
Message-ID: <20121112141653.GA7228@optiplex.redhat.com> (raw)
In-Reply-To: <CAPgLHd80RvvGdTKN3aR7dQ_b1S3_pAkMwmGjewc7zgf=4jafcg@mail.gmail.com>
On Mon, Nov 12, 2012 at 09:50:40PM +0800, Wei Yongjun wrote:
> From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
>
> Add the missing unlock before return from function fill_balloon()
> in the error handling case.
>
> Introduced by 9864a8(virtio_balloon: introduce migration primitives
> to balloon pages)
>
> dpatch engine is used to auto generate this patch.
> (https://github.com/weiyj/dpatch)
>
> Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
> ---
> drivers/virtio/virtio_balloon.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/virtio/virtio_balloon.c b/drivers/virtio/virtio_balloon.c
> index f70151b..72e8dcb 100644
> --- a/drivers/virtio/virtio_balloon.c
> +++ b/drivers/virtio/virtio_balloon.c
> @@ -152,8 +152,10 @@ static void fill_balloon(struct virtio_balloon *vb, size_t num)
> }
>
> /* Didn't get any? Oh well. */
> - if (vb->num_pfns == 0)
> + if (vb->num_pfns == 0) {
> + mutex_unlock(&vb->balloon_lock);
> return;
> + }
>
> tell_host(vb, vb->inflate_vq);
> mutex_unlock(&vb->balloon_lock);
>
I missed that one when rewriting v10 to v11. :(
Good catch, Wei! thanks!
Andrew, we need this pick for the virtio_balloon v12 patch, as well.
-- Rafael
next prev parent reply other threads:[~2012-11-12 14:16 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-12 13:50 [PATCH -next] virtio: balloon: fix missing unlock on error in fill_balloon() Wei Yongjun
2012-11-12 14:16 ` Rafael Aquini [this message]
2012-11-12 23:34 ` Andrew Morton
2012-11-13 12:47 ` Rafael Aquini
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=20121112141653.GA7228@optiplex.redhat.com \
--to=aquini@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mst@redhat.com \
--cc=virtualization@lists.linux-foundation.org \
--cc=weiyj.lk@gmail.com \
--cc=yongjun_wei@trendmicro.com.cn \
/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).