From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 47276A0542 for ; Fri, 7 Feb 2020 16:14:11 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id DDFCC1C067; Fri, 7 Feb 2020 16:14:10 +0100 (CET) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by dpdk.org (Postfix) with ESMTP id A27271BF8E for ; Fri, 7 Feb 2020 16:14:09 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1581088449; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DWz/oGAv/Z5Nu8GnLptF8b9DDuzLL4C0ntBVf2C2HU8=; b=go8CEifQxbDIrtQReZ4ht5DtlYBzum30m1pvodr7ebD8dvnPKAAqmODxScigQaBmULh+MX Uv8CwbmFDSl1rTIZyNjdmBAQRgfJ52WtaDpr0ssJ/xSZALDq6xtEnXt9hH+CCAa+tO66zt nk9PM+5jiD8v2oY9g+/FNHzkowOsYug= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-130-ll0ZFSWdM5S_G0J8B6YvKw-1; Fri, 07 Feb 2020 10:13:53 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1A1131800D42; Fri, 7 Feb 2020 15:13:52 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.76]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0B0B510016DA; Fri, 7 Feb 2020 15:13:50 +0000 (UTC) From: Kevin Traynor To: Stephen Hemminger Cc: Tiwei Bie , dpdk stable Date: Fri, 7 Feb 2020 15:12:38 +0000 Message-Id: <20200207151248.29804-26-ktraynor@redhat.com> In-Reply-To: <20200207151248.29804-1-ktraynor@redhat.com> References: <20200207151248.29804-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: ll0ZFSWdM5S_G0J8B6YvKw-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'net/virtio-user: check file descriptor before closing' has been queued to LTS release 18.11.7 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/13/20. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasi= ng (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/a3f5b5bbf79af44738= fa2dafefaaa09409418f3e Thanks. Kevin. --- >From a3f5b5bbf79af44738fa2dafefaaa09409418f3e Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Mon, 6 Jan 2020 11:18:37 -0800 Subject: [PATCH] net/virtio-user: check file descriptor before closing [ upstream commit b56c12acf20585ad46faf9455b4b9aeb30450ef0 ] Valgrind complains that virtio_user is calling close(-1). Fix this by adding check in virtio that is similar to existing code. Fixes: 37a7eb2ae816 ("net/virtio-user: add device emulation layer") Signed-off-by: Stephen Hemminger Reviewed-by: Tiwei Bie --- drivers/net/virtio/virtio_user/virtio_user_dev.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.c b/drivers/net= /virtio/virtio_user/virtio_user_dev.c index 91536c667a..f6356eabc6 100644 --- a/drivers/net/virtio/virtio_user/virtio_user_dev.c +++ b/drivers/net/virtio/virtio_user/virtio_user_dev.c @@ -525,5 +525,6 @@ virtio_user_dev_uninit(struct virtio_user_dev *dev) =09} =20 -=09close(dev->vhostfd); +=09if (dev->vhostfd >=3D 0) +=09=09close(dev->vhostfd); =20 =09if (dev->is_server && dev->listenfd >=3D 0) { --=20 2.21.1 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092020-02-07 15:08:18.877065267 +0000 +++ 0026-net-virtio-user-check-file-descriptor-before-closing.patch=092020-= 02-07 15:08:17.544062551 +0000 @@ -1 +1 @@ -From b56c12acf20585ad46faf9455b4b9aeb30450ef0 Mon Sep 17 00:00:00 2001 +From a3f5b5bbf79af44738fa2dafefaaa09409418f3e Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit b56c12acf20585ad46faf9455b4b9aeb30450ef0 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index ea016e85d8..ffbaa75b7e 100644 +index 91536c667a..f6356eabc6 100644 @@ -22 +23 @@ -@@ -538,5 +538,6 @@ virtio_user_dev_uninit(struct virtio_user_dev *dev) +@@ -525,5 +525,6 @@ virtio_user_dev_uninit(struct virtio_user_dev *dev)