From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 9C899A0350 for ; Mon, 21 Feb 2022 16:40:31 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 96FE840DF6; Mon, 21 Feb 2022 16:40:31 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 9D00141143 for ; Mon, 21 Feb 2022 16:40:30 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645458030; 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=ef39CGSdNqUHJqZAIgSAsTtqa40KS0YGSu3QMjn0zvo=; b=NWKmZlPNTLpsQn4tZjvGUhWzBPDknm+mDCu6Wfzq7ttCqxygtyyfKZFz5YsAGaftDdVWsN 1Y6aGCh4A/0yVkXIVG5BGdVKbmsPY2AZ3oJf1T4i1OCh3MdjKhaH7gPvr3h9mEGdIZEnZA D6nNjpySfl/fxgJCjqitQIz46Pl3rh8= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-111-IB3Ed1DTM1OrWiJsM66quA-1; Mon, 21 Feb 2022 10:40:27 -0500 X-MC-Unique: IB3Ed1DTM1OrWiJsM66quA-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0585A1846089; Mon, 21 Feb 2022 15:40:26 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id F03E07E131; Mon, 21 Feb 2022 15:40:24 +0000 (UTC) From: Kevin Traynor To: Yunjian Wang Cc: Chenbo Xia , dpdk stable Subject: patch 'net/virtio-user: check FD flags getting failure' has been queued to stable release 21.11.1 Date: Mon, 21 Feb 2022 15:35:00 +0000 Message-Id: <20220221153625.152324-111-ktraynor@redhat.com> In-Reply-To: <20220221153625.152324-1-ktraynor@redhat.com> References: <20220221153625.152324-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 Hi, FYI, your patch has been queued to stable release 21.11.1 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/26/22. 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 This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/0d2ddde4191af057c9b822728dbf8592874367b5 Thanks. Kevin --- >From 0d2ddde4191af057c9b822728dbf8592874367b5 Mon Sep 17 00:00:00 2001 From: Yunjian Wang Date: Sat, 8 Jan 2022 15:52:31 +0800 Subject: [PATCH] net/virtio-user: check FD flags getting failure [ upstream commit 6abf10a21b293cb427ef21c59f490592717cb211 ] The function fcntl() could return errors, the return value need to be checked. Fixes: 6a84c37e3975 ("net/virtio-user: add vhost-user adapter layer") Signed-off-by: Yunjian Wang Reviewed-by: Chenbo Xia --- drivers/net/virtio/virtio_user/vhost_user.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/virtio/virtio_user/vhost_user.c b/drivers/net/virtio/virtio_user/vhost_user.c index cc830a660f..0a39393c45 100644 --- a/drivers/net/virtio/virtio_user/vhost_user.c +++ b/drivers/net/virtio/virtio_user/vhost_user.c @@ -841,6 +841,8 @@ vhost_user_setup(struct virtio_user_dev *dev) flag = fcntl(fd, F_GETFD); - if (fcntl(fd, F_SETFD, flag | FD_CLOEXEC) < 0) - PMD_DRV_LOG(WARNING, "fcntl failed, %s", strerror(errno)); + if (flag == -1) + PMD_DRV_LOG(WARNING, "fcntl get fd failed, %s", strerror(errno)); + else if (fcntl(fd, F_SETFD, flag | FD_CLOEXEC) < 0) + PMD_DRV_LOG(WARNING, "fcntl set fd failed, %s", strerror(errno)); memset(&un, 0, sizeof(un)); -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-21 15:22:47.008201052 +0000 +++ 0111-net-virtio-user-check-FD-flags-getting-failure.patch 2022-02-21 15:22:44.216704407 +0000 @@ -1 +1 @@ -From 6abf10a21b293cb427ef21c59f490592717cb211 Mon Sep 17 00:00:00 2001 +From 0d2ddde4191af057c9b822728dbf8592874367b5 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 6abf10a21b293cb427ef21c59f490592717cb211 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org