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 4E904A0555 for ; Wed, 19 Feb 2020 16:57:48 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 47347B62; Wed, 19 Feb 2020 16:57:48 +0100 (CET) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by dpdk.org (Postfix) with ESMTP id 8887FB62 for ; Wed, 19 Feb 2020 16:57:46 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582127866; 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=tl3ps2h4BmFlLMbCZ4bJUupJls0QhdytPOfLRJq2O38=; b=fz7qxJrgHf9Wb11GIExPXd8jnEOK27w3zfFBrRmxkbt/+Q9vcW70gIOutX0phSnAuZg6R2 qe6JaJ6d5GdF9K113ObHb3oUjpyytKaC0HymidCEEUUR/nx1bz3CpHIcY11aYFh0WCVOnC g8BYJd1/Yf1F1g/X77TvrVXqIxf014c= 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-136-ahSnJOpdMvCh9bA-mbn6lQ-1; Wed, 19 Feb 2020 10:57:43 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 42ACA8017CC; Wed, 19 Feb 2020 15:57:42 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.109]) by smtp.corp.redhat.com (Postfix) with ESMTP id E7CCC811F8; Wed, 19 Feb 2020 15:57:34 +0000 (UTC) From: Kevin Traynor To: Maxime Coquelin Cc: Ilja Van Sprundel , Tiwei Bie , dpdk stable Date: Wed, 19 Feb 2020 15:56:01 +0000 Message-Id: <20200219155607.20495-16-ktraynor@redhat.com> In-Reply-To: <20200219155607.20495-1-ktraynor@redhat.com> References: <20200219155607.20495-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: ahSnJOpdMvCh9bA-mbn6lQ-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 'vhost: check message header size read' 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/25/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/9f9f2da932f3a6f3d5= fde901841ab46f79190aa7 Thanks. Kevin. --- >From 9f9f2da932f3a6f3d5fde901841ab46f79190aa7 Mon Sep 17 00:00:00 2001 From: Maxime Coquelin Date: Wed, 5 Feb 2020 16:05:29 +0100 Subject: [PATCH] vhost: check message header size read [ upstream commit 966f89d998a20eddb45666f06dd42a3c3fc94574 ] This patch adds a check to ensure the read size of the Vhost-user message header is not smaller than the expected size. In case of unexpected read size, report an error and close file descriptors passed with the message, if any. Fixes: 8f972312b8f4 ("vhost: support vhost-user") Reported-by: Ilja Van Sprundel Signed-off-by: Maxime Coquelin Reviewed-by: Tiwei Bie --- lib/librte_vhost/vhost_user.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c index 4c58880f8c..13606cea44 100644 --- a/lib/librte_vhost/vhost_user.c +++ b/lib/librte_vhost/vhost_user.c @@ -1998,6 +1998,12 @@ read_vhost_message(int sockfd, struct VhostUserMsg *= msg) =09ret =3D read_fd_message(sockfd, (char *)msg, VHOST_USER_HDR_SIZE, =09=09msg->fds, VHOST_MEMORY_MAX_NREGIONS, &msg->fd_num); -=09if (ret <=3D 0) +=09if (ret <=3D 0) { =09=09return ret; +=09} else if (ret !=3D VHOST_USER_HDR_SIZE) { +=09=09RTE_LOG(ERR, VHOST_CONFIG, +=09=09=09"Unexpected header size read\n"); +=09=09close_msg_fds(msg); +=09=09return -1; +=09} =20 =09if (msg->size) { --=20 2.21.1 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092020-02-19 15:43:50.562675531 +0000 +++ 0016-vhost-check-message-header-size-read.patch=092020-02-19 15:43:49.7= 53141547 +0000 @@ -1 +1 @@ -From 966f89d998a20eddb45666f06dd42a3c3fc94574 Mon Sep 17 00:00:00 2001 +From 9f9f2da932f3a6f3d5fde901841ab46f79190aa7 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 966f89d998a20eddb45666f06dd42a3c3fc94574 ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org @@ -21,2 +22,2 @@ - lib/librte_vhost/vhost_user.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) + lib/librte_vhost/vhost_user.c | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) @@ -25 +26 @@ -index 9f14ea6676..91482ccd67 100644 +index 4c58880f8c..13606cea44 100644 @@ -28 +29 @@ -@@ -2457,6 +2457,11 @@ read_vhost_message(int sockfd, struct VhostUserMsg = *msg) +@@ -1998,6 +1998,12 @@ read_vhost_message(int sockfd, struct VhostUserMsg = *msg) @@ -35 +36,2 @@ -+=09=09VHOST_LOG_CONFIG(ERR, "Unexpected header size read\n"); ++=09=09RTE_LOG(ERR, VHOST_CONFIG, ++=09=09=09"Unexpected header size read\n");