From: Jason Wang <jasowang@redhat.com>
To: mst@redhat.com
Cc: virtualization@lists.linux-foundation.org,
linux-kernel@vger.kernel.org, xieyongji@bytedance.com,
stefanha@redhat.com, file@sect.tu-berlin.de,
ashish.kalra@amd.com, konrad.wilk@oracle.com,
kvm@vger.kernel.org, hch@infradead.org, ak@linux.intel.com,
luto@kernel.org, Jason Wang <jasowang@redhat.com>
Subject: [PATCH 6/7] virtio: use err label in __vring_new_virtqueue()
Date: Fri, 4 Jun 2021 13:53:49 +0800 [thread overview]
Message-ID: <20210604055350.58753-7-jasowang@redhat.com> (raw)
In-Reply-To: <20210604055350.58753-1-jasowang@redhat.com>
Using error label for unwind in __vring_new_virtqueue. This is useful
for future refacotring.
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
drivers/virtio/virtio_ring.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c
index 11dfa0dc8ec1..9800f1c9ce4c 100644
--- a/drivers/virtio/virtio_ring.c
+++ b/drivers/virtio/virtio_ring.c
@@ -2137,10 +2137,8 @@ struct virtqueue *__vring_new_virtqueue(unsigned int index,
vq->split.desc_state = kmalloc_array(vring.num,
sizeof(struct vring_desc_state_split), GFP_KERNEL);
- if (!vq->split.desc_state) {
- kfree(vq);
- return NULL;
- }
+ if (!vq->split.desc_state)
+ goto err_state;
/* Put everything in free lists. */
vq->free_head = 0;
@@ -2151,6 +2149,10 @@ struct virtqueue *__vring_new_virtqueue(unsigned int index,
list_add_tail(&vq->vq.list, &vdev->vqs);
return &vq->vq;
+
+err_state:
+ kfree(vq);
+ return NULL;
}
EXPORT_SYMBOL_GPL(__vring_new_virtqueue);
--
2.25.1
next prev parent reply other threads:[~2021-06-04 5:55 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-04 5:53 [PATCH 0/7] Do not read from descriptor ring Jason Wang
2021-06-04 5:53 ` [PATCH 1/7] virtio-ring: maintain next in extra state for packed virtqueue Jason Wang
2021-06-04 5:53 ` [PATCH 2/7] virtio_ring: rename vring_desc_extra_packed Jason Wang
2021-06-04 5:53 ` [PATCH 3/7] virtio-ring: factor out desc_extra allocation Jason Wang
2021-06-04 5:53 ` [PATCH 4/7] virtio_ring: secure handling of mapping errors Jason Wang
2021-06-04 5:53 ` [PATCH 5/7] virtio_ring: introduce virtqueue_desc_add_split() Jason Wang
2021-06-04 5:53 ` Jason Wang [this message]
2021-06-04 5:53 ` [PATCH 7/7] virtio-ring: store DMA metadata in desc_extra for split virtqueue Jason Wang
2021-06-08 16:24 ` [PATCH 0/7] Do not read from descriptor ring Andy Lutomirski
2021-06-10 3:12 ` Jason Wang
2021-07-11 16:08 ` Michael S. Tsirkin
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=20210604055350.58753-7-jasowang@redhat.com \
--to=jasowang@redhat.com \
--cc=ak@linux.intel.com \
--cc=ashish.kalra@amd.com \
--cc=file@sect.tu-berlin.de \
--cc=hch@infradead.org \
--cc=konrad.wilk@oracle.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@kernel.org \
--cc=mst@redhat.com \
--cc=stefanha@redhat.com \
--cc=virtualization@lists.linux-foundation.org \
--cc=xieyongji@bytedance.com \
/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).