Patchwork [10/12] kvm: Fix warning from static code analysis

login
register
mail settings
Submitter Stefan Hajnoczi
Date Sept. 14, 2012, 8:42 a.m.
Message ID <1347612146-5407-11-git-send-email-stefanha@gmail.com>
Download mbox | patch
Permalink /patch/183863/
State New
Headers show

Comments

Stefan Hajnoczi - Sept. 14, 2012, 8:42 a.m.
From: Stefan Weil <sw@weilnetz.de>

Report from smatch:

kvm-all.c:1373 kvm_init(135) warn:
 variable dereferenced before check 's' (see line 1360)

's' cannot by NULL (it was alloced using g_malloc0), so there is no need
to check it here.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Stefan Hajnoczi <stefanha@gmail.com>
---
 kvm-all.c |   12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

Patch

diff --git a/kvm-all.c b/kvm-all.c
index 39cff55..e5ed3df 100644
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -1409,13 +1409,11 @@  int kvm_init(void)
     return 0;
 
 err:
-    if (s) {
-        if (s->vmfd >= 0) {
-            close(s->vmfd);
-        }
-        if (s->fd != -1) {
-            close(s->fd);
-        }
+    if (s->vmfd >= 0) {
+        close(s->vmfd);
+    }
+    if (s->fd != -1) {
+        close(s->fd);
     }
     g_free(s);