From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C5102C04E53 for ; Wed, 15 May 2019 11:34:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8D97D2053B for ; Wed, 15 May 2019 11:34:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557920079; bh=WP096DrFJd9NTFHr7Uf2Je+GPBnpNThOOq/0K7LtHTU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=BunM3rNeVNdHYhXg41iWXXSWH85zr75Bm+X2RBsjoyka1XFtL12IDQP2OxsK+nbaw vE19eko08HXe9llrh3imNl4d2KWCoDDMtnq22S7Sc8CgZCwsrmRoJr+ezn++mRb29Z K1C02XXOXVLTB0OLXNR3hVLOxY+Gt6RYEqjDzmcM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387407AbfEOLeL (ORCPT ); Wed, 15 May 2019 07:34:11 -0400 Received: from mail.kernel.org ([198.145.29.99]:46184 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387403AbfEOLeK (ORCPT ); Wed, 15 May 2019 07:34:10 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9BAA62084A; Wed, 15 May 2019 11:34:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557920050; bh=WP096DrFJd9NTFHr7Uf2Je+GPBnpNThOOq/0K7LtHTU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eOSF5zw1KGuoFb5enexI+TVaqWbTlkb5lMqo2nY3Lliv0c2i+skuAOnKFIih8bstB ugW89mP9FbbfxVLxiEG+qDOpiAmOJkIF83ohTyrsmUyrFnjihxnNEuAuof1JvAtvIp ve/7RXtT0g2tZ3Sds43pUWjY5JQb0fU6bfntwf74= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, YueHaibing , "Michael S. Tsirkin" , Jason Wang Subject: [PATCH 5.1 42/46] virtio_ring: Fix potential mem leak in virtqueue_add_indirect_packed Date: Wed, 15 May 2019 12:57:06 +0200 Message-Id: <20190515090628.890546862@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190515090616.670410738@linuxfoundation.org> References: <20190515090616.670410738@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: YueHaibing commit df0bfe7501e9319546ea380d39674a4179e059c3 upstream. 'desc' should be freed before leaving from err handing path. Fixes: 1ce9e6055fa0 ("virtio_ring: introduce packed ring support") Signed-off-by: YueHaibing Signed-off-by: Michael S. Tsirkin Acked-by: Jason Wang stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman --- drivers/virtio/virtio_ring.c | 1 + 1 file changed, 1 insertion(+) --- a/drivers/virtio/virtio_ring.c +++ b/drivers/virtio/virtio_ring.c @@ -1004,6 +1004,7 @@ static int virtqueue_add_indirect_packed if (unlikely(vq->vq.num_free < 1)) { pr_debug("Can't add buf len 1 - avail = 0\n"); + kfree(desc); END_USE(vq); return -ENOSPC; }