diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2011-12-14 15:37:17 +0000 |
|---|---|---|
| committer | Riku Voipio <riku.voipio@linaro.org> | 2012-02-02 17:51:20 +0200 |
| commit | e3c33ec6b07dc4d0503cb43b2114be47fc344d36 (patch) | |
| tree | 61d4ae8faf41b87a8f42efeb48fce5f97810e682 /linux-user | |
| parent | 5379557b8d5acb140c17e00441fda45eae627fed (diff) | |
| download | focaccia-qemu-e3c33ec6b07dc4d0503cb43b2114be47fc344d36.tar.gz focaccia-qemu-e3c33ec6b07dc4d0503cb43b2114be47fc344d36.zip | |
linux-user: Allow NULL value pointer in setxattr and getxattr
It's valid to pass a NULL value pointer to setxattr, so don't fail this case EFAULT. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
Diffstat (limited to 'linux-user')
| -rw-r--r-- | linux-user/syscall.c | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 06b19e0471..0a78a185b7 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -7809,11 +7809,17 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, break; case TARGET_NR_setxattr: { - void *p, *n, *v; + void *p, *n, *v = 0; + if (arg3) { + v = lock_user(VERIFY_READ, arg3, arg4, 1); + if (!v) { + ret = -TARGET_EFAULT; + break; + } + } p = lock_user_string(arg1); n = lock_user_string(arg2); - v = lock_user(VERIFY_READ, arg3, arg4, 1); - if (p && n && v) { + if (p && n) { ret = get_errno(setxattr(p, n, v, arg4, arg5)); } else { ret = -TARGET_EFAULT; @@ -7825,11 +7831,17 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, break; case TARGET_NR_getxattr: { - void *p, *n, *v; + void *p, *n, *v = 0; + if (arg3) { + v = lock_user(VERIFY_WRITE, arg3, arg4, 0); + if (!v) { + ret = -TARGET_EFAULT; + break; + } + } p = lock_user_string(arg1); n = lock_user_string(arg2); - v = lock_user(VERIFY_WRITE, arg3, arg4, 0); - if (p && n && v) { + if (p && n) { ret = get_errno(getxattr(p, n, v, arg4)); } else { ret = -TARGET_EFAULT; |