|
 |
9119d9 |
From 670f47b3b50915fbd772134e0d278956f92d2815 Mon Sep 17 00:00:00 2001
|
|
|
9119d9 |
Message-Id: <670f47b3b50915fbd772134e0d278956f92d2815@dist-git>
|
|
|
9119d9 |
From: John Ferlan <jferlan@redhat.com>
|
|
|
9119d9 |
Date: Mon, 15 Sep 2014 15:13:49 -0400
|
|
|
9119d9 |
Subject: [PATCH] lxc: Resolve Coverity FORWARD_NULL
|
|
|
9119d9 |
|
|
|
9119d9 |
https://bugzilla.redhat.com/show_bug.cgi?id=1141209
|
|
|
9119d9 |
|
|
|
9119d9 |
If we jump to cleanup before allocating 'result', then the call to
|
|
|
9119d9 |
virBlkioDeviceArrayClear() could dereference result
|
|
|
9119d9 |
|
|
|
9119d9 |
Signed-off-by: John Ferlan <jferlan@redhat.com>
|
|
|
9119d9 |
(cherry picked from commit 0311be9435087984c495243fbb378b7533beb99e)
|
|
|
9119d9 |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
9119d9 |
---
|
|
|
9119d9 |
src/lxc/lxc_driver.c | 6 ++++--
|
|
|
9119d9 |
1 file changed, 4 insertions(+), 2 deletions(-)
|
|
|
9119d9 |
|
|
|
9119d9 |
diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
|
|
|
9119d9 |
index 66d708a..bdfad9e 100644
|
|
|
9119d9 |
--- a/src/lxc/lxc_driver.c
|
|
|
9119d9 |
+++ b/src/lxc/lxc_driver.c
|
|
|
9119d9 |
@@ -2222,8 +2222,10 @@ lxcDomainParseBlkioDeviceStr(char *blkioDeviceStr, const char *type,
|
|
|
9119d9 |
_("unable to parse blkio device '%s' '%s'"),
|
|
|
9119d9 |
type, blkioDeviceStr);
|
|
|
9119d9 |
cleanup:
|
|
|
9119d9 |
- virBlkioDeviceArrayClear(result, ndevices);
|
|
|
9119d9 |
- VIR_FREE(result);
|
|
|
9119d9 |
+ if (result) {
|
|
|
9119d9 |
+ virBlkioDeviceArrayClear(result, ndevices);
|
|
|
9119d9 |
+ VIR_FREE(result);
|
|
|
9119d9 |
+ }
|
|
|
9119d9 |
return -1;
|
|
|
9119d9 |
}
|
|
|
9119d9 |
|
|
|
9119d9 |
--
|
|
|
9119d9 |
2.1.0
|
|
|
9119d9 |
|