Blame 0225-linux-user-Remove-redundant-null-check-and-replace-f.patch
|
 |
5544c1 |
From 755055c908ccda2dd9410bb1bde1f3621017fb0c Mon Sep 17 00:00:00 2001
|
|
|
5544c1 |
From: Stefan Weil <sw@weilnetz.de>
|
|
|
5544c1 |
Date: Tue, 4 Sep 2012 22:14:19 +0200
|
|
|
5544c1 |
Subject: [PATCH] linux-user: Remove redundant null check and replace free by
|
|
|
5544c1 |
g_free
|
|
|
5544c1 |
|
|
|
5544c1 |
Report from smatch:
|
|
|
5544c1 |
|
|
|
5544c1 |
linux-user/syscall.c:3632 do_ioctl_dm(220) info:
|
|
|
5544c1 |
redundant null check on big_buf calling free()
|
|
|
5544c1 |
|
|
|
5544c1 |
'big_buf' was allocated by g_malloc0, therefore free was also
|
|
|
5544c1 |
replaced by g_free.
|
|
|
5544c1 |
|
|
|
5544c1 |
Signed-off-by: Stefan Weil <sw@weilnetz.de>
|
|
|
5544c1 |
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
|
|
|
5544c1 |
Signed-off-by: Stefan Hajnoczi <stefanha@gmail.com>
|
|
|
5544c1 |
(cherry picked from commit ad11ad77748bdd8016370db210751683dc038dd6)
|
|
|
5544c1 |
|
|
|
5544c1 |
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
|
|
|
5544c1 |
---
|
|
|
5544c1 |
linux-user/syscall.c | 4 +---
|
|
|
5544c1 |
1 file changed, 1 insertion(+), 3 deletions(-)
|
|
|
5544c1 |
|
|
|
5544c1 |
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
|
|
|
5544c1 |
index 6257a04..471d060 100644
|
|
|
5544c1 |
--- a/linux-user/syscall.c
|
|
|
5544c1 |
+++ b/linux-user/syscall.c
|
|
|
5544c1 |
@@ -3628,9 +3628,7 @@ static abi_long do_ioctl_dm(const IOCTLEntry *ie, uint8_t *buf_temp, int fd,
|
|
|
5544c1 |
unlock_user(argptr, arg, target_size);
|
|
|
5544c1 |
}
|
|
|
5544c1 |
out:
|
|
|
5544c1 |
- if (big_buf) {
|
|
|
5544c1 |
- free(big_buf);
|
|
|
5544c1 |
- }
|
|
|
5544c1 |
+ g_free(big_buf);
|
|
|
5544c1 |
return ret;
|
|
|
5544c1 |
}
|
|
|
5544c1 |
|
|
|
5544c1 |
--
|
|
|
5544c1 |
1.7.12.1
|
|
|
5544c1 |
|