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

linux-user/syscall.c: lock_iovec: unlock vec[i] in failure processing code block 

When failure occurs during locking of vec[i], we also need to unlock all
already locked vec[i] in failure processing code block before return.

Code in unlock_user() checks vec[i].iov_base for NULL, so there's no
need not check it .

If error is EFAULT when "i == 0", vec[i].iov_base is NULL, we can just
skip it, so can still use "while (--i >= 0)" loop condition.

Signed-off-by: Chen Gang <gang.chen.5i5j@gmail.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
This commit is contained in:
Chen Gang S 2015-01-23 18:01:09 +08:00 committed by Michael Tokarev
parent 88ea8ed74c
commit 7eff518b6c
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
linux-user/syscall.c
View File

@ -1883,6 +1883,11 @@ static struct iovec *lock_iovec(int type, abi_ulong target_addr,
return vec;
fail:
while (--i >= 0) {
if (tswapal(target_vec[i].iov_len) > 0) {
unlock_user(vec[i].iov_base, tswapal(target_vec[i].iov_base), 0);
}
}
unlock_user(target_vec, target_addr, 0);
fail2:
free(vec);