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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 783AEC4332B for ; Wed, 18 Mar 2020 21:07:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 445CD20775 for ; Wed, 18 Mar 2020 21:07:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584565631; bh=AkUXhWTvMH5WqnlJ+9dw58ZG2shO13fuumDz8hrq7iU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=wB2WUGQ+PdHTLuk80wM2kAqEs7aAjepApKYpielYgJgNFsYY2zSUzrVqvXScxBBuA zjZgzbSJ7xGTF/84MGZJu9vjyUc0sxyAuoXk8GFL3+hyjHVr6asQSXhtu7MEi33ZaB iXWDBp7Wp/92oLRsHm91t7KnAi+jr0dZajAzYIIY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727845AbgCRVHH (ORCPT ); Wed, 18 Mar 2020 17:07:07 -0400 Received: from mail.kernel.org ([198.145.29.99]:53916 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727789AbgCRUyX (ORCPT ); Wed, 18 Mar 2020 16:54:23 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 80F232098B; Wed, 18 Mar 2020 20:54:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584564863; bh=AkUXhWTvMH5WqnlJ+9dw58ZG2shO13fuumDz8hrq7iU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=j65JHtwu9+zn7xa8U3XFTbm9X8NlSAO0WYhZpusJ9Ww01bRF7xrWUMBAaCGUWKqve wV1LIGDAu+1HsSn5AkDfGppNci8ze8tr3eWEUA9rmXzNStPrH/XlfWRLTDIiwicOON 9PfaoQhwl5r0Il2B1c1MMGTqclQEslakxaZd2h5Q= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Suman Anna , "Michael S . Tsirkin" , Jason Wang , Sasha Levin , virtualization@lists.linux-foundation.org Subject: [PATCH AUTOSEL 5.4 36/73] virtio_ring: Fix mem leak with vring_new_virtqueue() Date: Wed, 18 Mar 2020 16:53:00 -0400 Message-Id: <20200318205337.16279-36-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200318205337.16279-1-sashal@kernel.org> References: <20200318205337.16279-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Suman Anna [ Upstream commit f13f09a12cbd0c7b776e083c5d008b6c6a9c4e0b ] The functions vring_new_virtqueue() and __vring_new_virtqueue() are used with split rings, and any allocations within these functions are managed outside of the .we_own_ring flag. The commit cbeedb72b97a ("virtio_ring: allocate desc state for split ring separately") allocates the desc state within the __vring_new_virtqueue() but frees it only when the .we_own_ring flag is set. This leads to a memory leak when freeing such allocated virtqueues with the vring_del_virtqueue() function. Fix this by moving the desc_state free code outside the flag and only for split rings. Issue was discovered during testing with remoteproc and virtio_rpmsg. Fixes: cbeedb72b97a ("virtio_ring: allocate desc state for split ring separately") Signed-off-by: Suman Anna Link: https://lore.kernel.org/r/20200224212643.30672-1-s-anna@ti.com Signed-off-by: Michael S. Tsirkin Acked-by: Jason Wang Signed-off-by: Sasha Levin --- drivers/virtio/virtio_ring.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c index 867c7ebd3f107..58b96baa8d488 100644 --- a/drivers/virtio/virtio_ring.c +++ b/drivers/virtio/virtio_ring.c @@ -2203,10 +2203,10 @@ void vring_del_virtqueue(struct virtqueue *_vq) vq->split.queue_size_in_bytes, vq->split.vring.desc, vq->split.queue_dma_addr); - - kfree(vq->split.desc_state); } } + if (!vq->packed_ring) + kfree(vq->split.desc_state); list_del(&_vq->list); kfree(vq); } -- 2.20.1