[dpdk-stable] patch 'examples/vhost_scsi: fix null-check for parameter' has been queued to LTS release 17.11.7

Yongseok Koh yskoh at mellanox.com
Tue Jul 23 03:00:54 CEST 2019


Hi,

FYI, your patch has been queued to LTS release 17.11.7

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objection by 07/27/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. 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.

Yongseok

---
>From 8ceef396b56d3332852315afb5eacecf84692ec3 Mon Sep 17 00:00:00 2001
From: Bruce Richardson <bruce.richardson at intel.com>
Date: Mon, 8 Apr 2019 10:46:37 +0100
Subject: [PATCH] examples/vhost_scsi: fix null-check for parameter

[ upstream commit 6fd5b5734faf2f902aebf57e966e5adb0499a1ff ]

Coverity points out that there is a check in the main thread loop for the
ctrlr->bdev being NULL, but by that stage the pointer has already been
dereferenced. Therefore, for safety, before we enter the loop do an
initial check on the parameter structure.

Coverity issue: 158657
Fixes: db75c7af19bb ("examples/vhost_scsi: introduce a new sample app")

Signed-off-by: Bruce Richardson <bruce.richardson at intel.com>
Reviewed-by: Tiwei Bie <tiwei.bie at intel.com>
---
 examples/vhost_scsi/vhost_scsi.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/examples/vhost_scsi/vhost_scsi.c b/examples/vhost_scsi/vhost_scsi.c
index b40f993639..afa96e237c 100644
--- a/examples/vhost_scsi/vhost_scsi.c
+++ b/examples/vhost_scsi/vhost_scsi.c
@@ -315,6 +315,12 @@ ctrlr_worker(void *arg)
 	cpu_set_t cpuset;
 	pthread_t thread;
 
+	if (ctrlr == NULL || ctrlr->bdev == NULL) {
+		fprintf(stderr, "%s: Error, invalid argument passed to worker thread\n",
+				__func__);
+		exit(0);
+	}
+
 	thread = pthread_self();
 	CPU_ZERO(&cpuset);
 	CPU_SET(0, &cpuset);
-- 
2.21.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-07-22 17:55:11.169858753 -0700
+++ 0087-examples-vhost_scsi-fix-null-check-for-parameter.patch	2019-07-22 17:55:06.411476000 -0700
@@ -1,8 +1,10 @@
-From 6fd5b5734faf2f902aebf57e966e5adb0499a1ff Mon Sep 17 00:00:00 2001
+From 8ceef396b56d3332852315afb5eacecf84692ec3 Mon Sep 17 00:00:00 2001
 From: Bruce Richardson <bruce.richardson at intel.com>
 Date: Mon, 8 Apr 2019 10:46:37 +0100
 Subject: [PATCH] examples/vhost_scsi: fix null-check for parameter
 
+[ upstream commit 6fd5b5734faf2f902aebf57e966e5adb0499a1ff ]
+
 Coverity points out that there is a check in the main thread loop for the
 ctrlr->bdev being NULL, but by that stage the pointer has already been
 dereferenced. Therefore, for safety, before we enter the loop do an
@@ -10,7 +12,6 @@
 
 Coverity issue: 158657
 Fixes: db75c7af19bb ("examples/vhost_scsi: introduce a new sample app")
-Cc: stable at dpdk.org
 
 Signed-off-by: Bruce Richardson <bruce.richardson at intel.com>
 Reviewed-by: Tiwei Bie <tiwei.bie at intel.com>
@@ -19,10 +20,10 @@
  1 file changed, 6 insertions(+)
 
 diff --git a/examples/vhost_scsi/vhost_scsi.c b/examples/vhost_scsi/vhost_scsi.c
-index 2908ff68b7..513af0cca4 100644
+index b40f993639..afa96e237c 100644
 --- a/examples/vhost_scsi/vhost_scsi.c
 +++ b/examples/vhost_scsi/vhost_scsi.c
-@@ -285,6 +285,12 @@ ctrlr_worker(void *arg)
+@@ -315,6 +315,12 @@ ctrlr_worker(void *arg)
  	cpu_set_t cpuset;
  	pthread_t thread;
  


More information about the stable mailing list