[dpdk-stable] patch 'examples/vhost: fix path allocation failure handling' has been queued to LTS release 17.11.6

[Yongseok Koh]

Hi,

FYI, your patch has been queued to LTS release 17.11.6

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objection by 03/13/19. So please
shout if anyone has objection.

Also note that after the patch there's a diff of the upstream commit vs the patch applied
to the branch. If the code is different (ie: not only metadata diffs), due for example to
a change in context or macro names, please double check it.

Thanks.

Yongseok

---
>From dc2d27d6a26975543954d4d91f4364136bc5f64c Mon Sep 17 00:00:00 2001
From: Tiwei Bie <tiwei.bie at intel.com>
Date: Tue, 15 Jan 2019 15:13:24 +0800
Subject: [PATCH] examples/vhost: fix path allocation failure handling

[ upstream commit d79035b7dd6e599589552573b53c138f488dead3 ]

Add the missing failure handling for path allocation,
as realloc() may fail.

Fixes: ad0eef4d2203 ("examples/vhost: support multiple socket files")

Signed-off-by: Tiwei Bie <tiwei.bie at intel.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin at redhat.com>
---
 examples/vhost/main.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/examples/vhost/main.c b/examples/vhost/main.c
index 82660a673..9a1ec0341 100644
--- a/examples/vhost/main.c
+++ b/examples/vhost/main.c
@@ -400,11 +400,19 @@ port_init(uint16_t port)
 static int
 us_vhost_parse_socket_path(const char *q_arg)
 {
+	char *old;
+
 	/* parse number string */
 	if (strnlen(q_arg, PATH_MAX) == PATH_MAX)
 		return -1;
 
+	old = socket_files;
 	socket_files = realloc(socket_files, PATH_MAX * (nb_sockets + 1));
+	if (socket_files == NULL) {
+		free(old);
+		return -1;
+	}
+
 	snprintf(socket_files + nb_sockets * PATH_MAX, PATH_MAX, "%s", q_arg);
 	nb_sockets++;
 
-- 
2.11.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-03-08 09:46:42.924680999 -0800
+++ 0055-examples-vhost-fix-path-allocation-failure-handling.patch	2019-03-08 09:46:40.283442000 -0800
@@ -1,13 +1,14 @@
-From d79035b7dd6e599589552573b53c138f488dead3 Mon Sep 17 00:00:00 2001
+From dc2d27d6a26975543954d4d91f4364136bc5f64c Mon Sep 17 00:00:00 2001
 From: Tiwei Bie <tiwei.bie at intel.com>
 Date: Tue, 15 Jan 2019 15:13:24 +0800
 Subject: [PATCH] examples/vhost: fix path allocation failure handling
 
+[ upstream commit d79035b7dd6e599589552573b53c138f488dead3 ]
+
 Add the missing failure handling for path allocation,
 as realloc() may fail.
 
 Fixes: ad0eef4d2203 ("examples/vhost: support multiple socket files")
-Cc: stable at dpdk.org
 
 Signed-off-by: Tiwei Bie <tiwei.bie at intel.com>
 Reviewed-by: Maxime Coquelin <maxime.coquelin at redhat.com>
@@ -16,10 +17,10 @@
  1 file changed, 8 insertions(+)
 
 diff --git a/examples/vhost/main.c b/examples/vhost/main.c
-index 645cf51e9..5e914f58e 100644
+index 82660a673..9a1ec0341 100644
 --- a/examples/vhost/main.c
 +++ b/examples/vhost/main.c
-@@ -353,11 +353,19 @@ port_init(uint16_t port)
+@@ -400,11 +400,19 @@ port_init(uint16_t port)
  static int
  us_vhost_parse_socket_path(const char *q_arg)
  {