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 268B3A04B1 for ; Fri, 28 Aug 2020 12:14:35 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 1E7001C112; Fri, 28 Aug 2020 12:14:35 +0200 (CEST) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by dpdk.org (Postfix) with ESMTP id 3CB531C119 for ; Fri, 28 Aug 2020 12:14:34 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598609673; 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=tq4FqUvvXg8InZ6MvnZwhdpko0hRJKta6mGtHMD377M=; b=YEiucLpPoQ6xSksYKDEhdOBgfcFgd2Vadivd5ZIfpwMUpyMt6wU32dmlgnPNmMq6ilg+/F FEOV3jGrWX1GRB7cBxAFVXCjIzET7lXeFDiuINxS4EOhpWUFpRoeDXHM/X36ZV81qeqgxZ klJHQoymngMTL89pydxmKC29Wp5Gbqg= 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-9-EIqxlu8rOWC4QPPScU3LHg-1; Fri, 28 Aug 2020 06:14:30 -0400 X-MC-Unique: EIqxlu8rOWC4QPPScU3LHg-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D842C802B76; Fri, 28 Aug 2020 10:14:29 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id E792119D7C; Fri, 28 Aug 2020 10:14:28 +0000 (UTC) From: Kevin Traynor To: Chenbo Xia Cc: Maxime Coquelin , dpdk stable Date: Fri, 28 Aug 2020 11:13:00 +0100 Message-Id: <20200828101308.223767-34-ktraynor@redhat.com> In-Reply-To: <20200828101308.223767-1-ktraynor@redhat.com> References: <20200828101308.223767-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/virtio-user: check tap system call setting' has been queued to LTS release 18.11.10 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.10 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 09/02/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 rebasing (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/55ae014f27fedb44ce5cd05f0427a09fb93d96f3 Thanks. Kevin. --- >From 55ae014f27fedb44ce5cd05f0427a09fb93d96f3 Mon Sep 17 00:00:00 2001 From: Chenbo Xia Date: Wed, 29 Jul 2020 13:12:30 +0000 Subject: [PATCH] net/virtio-user: check tap system call setting [ upstream commit 570ee25677d8634e99d2120b363f2dd4948d5bac ] Setting the flags of tapfd may fail and the return value should be checked. Coverity issue: 140739 Fixes: e3b434818bbb ("net/virtio-user: support kernel vhost") Signed-off-by: Chenbo Xia Reviewed-by: Maxime Coquelin --- drivers/net/virtio/virtio_user/vhost_kernel_tap.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/virtio/virtio_user/vhost_kernel_tap.c b/drivers/net/virtio/virtio_user/vhost_kernel_tap.c index e95cd9da4c..cdfbd4be7a 100644 --- a/drivers/net/virtio/virtio_user/vhost_kernel_tap.c +++ b/drivers/net/virtio/virtio_user/vhost_kernel_tap.c @@ -129,5 +129,8 @@ vhost_kernel_open_tap(char **p_ifname, int hdr_size, int req_mq, } - fcntl(tapfd, F_SETFL, O_NONBLOCK); + if (fcntl(tapfd, F_SETFL, O_NONBLOCK) < 0) { + PMD_DRV_LOG(ERR, "fcntl tapfd failed: %s", strerror(errno)); + goto error; + } if (ioctl(tapfd, TUNSETVNETHDRSZ, &hdr_size) < 0) { -- 2.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-08-28 11:03:26.741264575 +0100 +++ 0034-net-virtio-user-check-tap-system-call-setting.patch 2020-08-28 11:03:25.985955928 +0100 @@ -1 +1 @@ -From 570ee25677d8634e99d2120b363f2dd4948d5bac Mon Sep 17 00:00:00 2001 +From 55ae014f27fedb44ce5cd05f0427a09fb93d96f3 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 570ee25677d8634e99d2120b363f2dd4948d5bac ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 2fa4f0d661..acddefa33d 100644 +index e95cd9da4c..cdfbd4be7a 100644