On 12/27/2012 09:14 PM, Michael S. Tsirkin wrote: > On Thu, Dec 27, 2012 at 02:39:19PM +0800, Jason Wang wrote: >> Fix the leaking of oldubufs and fd refcnt when fail to initialized used ring. >> >> Signed-off-by: Jason Wang <jasow...@redhat.com> >> --- >> drivers/vhost/net.c | 14 +++++++++++--- >> 1 files changed, 11 insertions(+), 3 deletions(-) >> >> diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c >> index ebd08b2..629d6b5 100644 >> --- a/drivers/vhost/net.c >> +++ b/drivers/vhost/net.c >> @@ -834,8 +834,10 @@ static long vhost_net_set_backend(struct vhost_net *n, >> unsigned index, int fd) >> vhost_net_enable_vq(n, vq); >> >> r = vhost_init_used(vq); >> - if (r) >> - goto err_vq; >> + if (r) { >> + sock = NULL; >> + goto err_used; >> + } >> >> n->tx_packets = 0; >> n->tx_zcopy_err = 0; >> @@ -859,8 +861,14 @@ static long vhost_net_set_backend(struct vhost_net *n, >> unsigned index, int fd) >> mutex_unlock(&n->dev.mutex); >> return 0; >> >> +err_used: >> + if (oldubufs) >> + vhost_ubuf_put_and_wait(oldubufs); >> + if (oldsock) >> + fput(oldsock->file); >> err_ubufs: >> - fput(sock->file); >> + if (sock) >> + fput(sock->file); >> err_vq: >> mutex_unlock(&vq->mutex); >> err: > I think it's a real bug, but I don't see how the fix > makes sense. > We are returning an error, so we ideally > revert to the state before the faulty > operation. So this should put sock and ubufs, > not oldsock/oldubufs.
Agree. > > The best way is probably to change > vhost_init_used so that it gets private data > pointer as a parameter. > > We can then call it before ubuf alloc. > You can then add err_used right after err_ubufs > with no extra logic. > Make more sense, thanks. > > -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html