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

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.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/14/19. 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.

Thanks.

Kevin Traynor

---
>From 4fef18491498e0e816512f963fb478f6cfc7fc07 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 c4bdd3c43..2261f089f 100644
--- a/examples/vhost/main.c
+++ b/examples/vhost/main.c
@@ -376,9 +376,17 @@ 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.19.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-02-07 13:19:56.220680653 +0000
+++ 0029-examples-vhost-fix-path-allocation-failure-handling.patch	2019-02-07 13:19:55.000000000 +0000
@@ -1,13 +1,14 @@
-From d79035b7dd6e599589552573b53c138f488dead3 Mon Sep 17 00:00:00 2001
+From 4fef18491498e0e816512f963fb478f6cfc7fc07 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 c4bdd3c43..2261f089f 100644
 --- a/examples/vhost/main.c
 +++ b/examples/vhost/main.c
-@@ -354,9 +354,17 @@ static int
+@@ -376,9 +376,17 @@ static int
  us_vhost_parse_socket_path(const char *q_arg)
  {
 +	char *old;