From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755557AbcHCEWP (ORCPT ); Wed, 3 Aug 2016 00:22:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58948 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751613AbcHCEWF (ORCPT ); Wed, 3 Aug 2016 00:22:05 -0400 Date: Wed, 3 Aug 2016 07:22:01 +0300 From: "Michael S. Tsirkin" To: Wei Yongjun Cc: virtualization@lists.linux-foundation.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH -next v2] virtio: fix possible memory leak in virtqueue_add() Message-ID: <20160803072138-mutt-send-email-mst@kernel.org> References: <1470146345-19531-1-git-send-email-weiyj.lk@gmail.com> <1470147391-20549-1-git-send-email-weiyj.lk@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1470147391-20549-1-git-send-email-weiyj.lk@gmail.com> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Wed, 03 Aug 2016 04:22:04 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Aug 02, 2016 at 02:16:31PM +0000, Wei Yongjun wrote: > 'desc' is malloced in virtqueue_add() and should be freed before > leaving from the error handling cases, otherwise it will cause > memory leak. > > Signed-off-by: Wei Yongjun Appliecd except I moved this to before END_USE - seems cleaner as alloc is caller after START_USE. > --- > drivers/virtio/virtio_ring.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c > index 114a0c8..e4be912 100644 > --- a/drivers/virtio/virtio_ring.c > +++ b/drivers/virtio/virtio_ring.c > @@ -328,6 +328,8 @@ static inline int virtqueue_add(struct virtqueue *_vq, > if (out_sgs) > vq->notify(&vq->vq); > END_USE(vq); > + if (indirect) > + kfree(desc); > return -ENOSPC; > }