linux-user: fix mq_getsetattr implementation
PATCH v2 1/1 linux-user: fix mq_getsetattr implementation
mq_getsetattr implementation does not set errno correctly in case of error. Also in the presence of both 2nd and 3rd arguments it calls both mq_getattr and mq_setattr, whereas only the latter call would suffice.
Don't call mq_getattr in the presence of the 2nd argument. Don't copy output back to user in case of error. Use get_errno to set errno value.
This fixes test rt/tst-mqueue2 from the glibc testsuite.
Cc Lionel Landwerlin <[email protected]>
Cc Kirill A. Shutemov <[email protected]>
Cc Riku Voipio <[email protected]>
Cc Aurelien Jarno <[email protected]>
Cc Laurent Vivier <[email protected]>
Signed-off-by Max Filippov <[email protected]>
---
Changes v1->v2:
- don't copy output back to user in case of error;
- fix changelog.
linux-user/syscall.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
linux-user/syscall.c +7 -6
@@ -12092,15 +12092,16 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, {struct mq_attr posix_mq_attr_in, posix_mq_attr_out; ret =0 ; -if (arg3 !=0 ) { - ret =mq_getattr (arg1, &posix_mq_attr_out); -copy_to_user_mq_attr (arg3, &posix_mq_attr_out); - }if (arg2 !=0 ) {copy_from_user_mq_attr (&posix_mq_attr_in, arg2); - ret |=mq_setattr (arg1, &posix_mq_attr_in, &posix_mq_attr_out); + ret =mq_setattr (arg1, &posix_mq_attr_in, &posix_mq_attr_out); + }else if (arg3 !=0 ) { + ret =mq_getattr (arg1, &posix_mq_attr_out); } - +if (ret ==0 && arg3 !=0 ) { +copy_to_user_mq_attr (arg3, &posix_mq_attr_out); + } + ret =get_errno (ret); }break ;#endif
Signature · 1 line
2.11.0