Received: by 10.223.185.116 with SMTP id b49csp588010wrg; Fri, 23 Feb 2018 03:44:34 -0800 (PST) X-Google-Smtp-Source: AH8x226DWmgYxTE/fwqCK8UlpvJGIuO/3qvgAtkEhqNVP2xbaPZ4ll9D6BfJ7sWgtIj62EyH1uiA X-Received: by 10.99.52.203 with SMTP id b194mr1253280pga.349.1519386273896; Fri, 23 Feb 2018 03:44:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519386273; cv=none; d=google.com; s=arc-20160816; b=Z1jEpiQYvtOxEbNxTHpkp3BuszBWoClRjxiElhX4cunvaRipc0hEFXo1nB+tzh+tUT Quoe0mg1n8GxD9DlYCuv3x8roOH+TYBCF0tFK+cx04flp3FDx6oLt7oC8RepcSXn6SBo o6un9JSUkeFwckG70qYf6DCojyF9IGhyKzVbIq7WNb+pnxuR4ymxKHgM0stsWEFzGLCu PZqqSpKYskr2j//jEDA3xKiSesT64Td4V6GK2UqeH+o5kmzlJzvHc6eAD08gt6LUxwGH 7Ci6nIFTA8KL63xpQQOk7JMMEQO/j67XPrCTeOF3sE7Uko5/U+bkmgNkO3sceTJu8oU8 Lcyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=LLIVLDXD8YNFIqmvl2Cu1AhF299D3y1jXWfdHwI2YYY=; b=I5uvi9Y4DaGLPyYUHJ78ujGHa9SyDwl3d4F5x/h8E9cSh1ydKNhHKaGd+EdcU1FURc 8DzQzyj50Tl4dv7AZMKsNhXRWN2B1FK2qs+EWuucLmTjWsf9y1UVrWmMwNoldYD739z1 Cf5VZG0ViRHO2Zt6rski2sLyVDG0EtTdcAcc0HDzGwUvHnJDdB8GBcSUS1guDaG8n2r+ uSJ6x45sx2IcgZbQ0+mKUfBgsFtroXkZgF4bYMZCfZBRedI3ojiD+Tiu5uGmjMY/Ubjy XRcqVwz++LCs0gJsQM9luGYBNB69d9lb7HD9nAo8urL/RO7C0r7yeS47KOZu+zjKFRaQ 2ePw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v187si1701629pfv.173.2018.02.23.03.44.19; Fri, 23 Feb 2018 03:44:33 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751402AbeBWLnk (ORCPT + 99 others); Fri, 23 Feb 2018 06:43:40 -0500 Received: from mga09.intel.com ([134.134.136.24]:65239 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751089AbeBWLnj (ORCPT ); Fri, 23 Feb 2018 06:43:39 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 23 Feb 2018 03:43:38 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,383,1515484800"; d="scan'208";a="22495077" Received: from debian.sh.intel.com ([10.67.104.164]) by fmsmga002.fm.intel.com with ESMTP; 23 Feb 2018 03:43:37 -0800 From: Tiwei Bie To: mst@redhat.com, jasowang@redhat.com, virtualization@lists.linux-foundation.org, linux-kernel@vger.kernel.org Cc: Andy Lutomirski , stable@vger.kernel.org Subject: [PATCH] virtio_ring: fix num_free handling in error case Date: Fri, 23 Feb 2018 19:41:30 +0800 Message-Id: <20180223114130.16332-1-tiwei.bie@intel.com> X-Mailer: git-send-email 2.11.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The vq->vq.num_free hasn't been changed when error happens, so it shouldn't be changed when handling the error. Fixes: 780bc7903a32 ("virtio_ring: Support DMA APIs") Cc: Andy Lutomirski Cc: Michael S. Tsirkin Cc: stable@vger.kernel.org Signed-off-by: Tiwei Bie --- drivers/virtio/virtio_ring.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c index eb30f3e09a47..71458f493cf8 100644 --- a/drivers/virtio/virtio_ring.c +++ b/drivers/virtio/virtio_ring.c @@ -428,8 +428,6 @@ static inline int virtqueue_add(struct virtqueue *_vq, i = virtio16_to_cpu(_vq->vdev, vq->vring.desc[i].next); } - vq->vq.num_free += total_sg; - if (indirect) kfree(desc); -- 2.11.0