OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

linux-user: Fix error handling in target_to_host_semarray()

Browse Source 
Fix two issues in error handling in target_to_host_semarray():
 * don't leak the host_array buffer if lock_user fails
 * return an error if malloc() fails

v2: added missing * -Riku Voipio

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
This commit is contained in:
Peter Maydell 2014-02-17 18:55:34 +00:00 committed by Riku Voipio
parent fff8c539bd
commit 69d4c703a5
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
linux-user/syscall.c
View File

@ -2430,10 +2430,15 @@ static inline abi_long target_to_host_semarray(int semid, unsigned short **host_
nsems = semid_ds.sem_nsems; nsems = semid_ds.sem_nsems;
*host_array = malloc(nsems*sizeof(unsigned short)); *host_array = malloc(nsems*sizeof(unsigned short));
if (!*host_array) {
return -TARGET_ENOMEM;
}
array = lock_user(VERIFY_READ, target_addr, array = lock_user(VERIFY_READ, target_addr,
nsems*sizeof(unsigned short), 1); nsems*sizeof(unsigned short), 1);
if (!array) if (!array) {
free(*host_array);
return -TARGET_EFAULT; return -TARGET_EFAULT;
}
for(i=0; i<nsems; i++) { for(i=0; i<nsems; i++) {
__get_user((*host_array)[i], &array[i]); __get_user((*host_array)[i], &array[i]);