From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60875) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f2JId-0007gQ-Sy for qemu-devel@nongnu.org; Sat, 31 Mar 2018 12:24:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f2JIc-0005Ja-ST for qemu-devel@nongnu.org; Sat, 31 Mar 2018 12:24:15 -0400 Received: from mail-lf0-x241.google.com ([2a00:1450:4010:c07::241]:33120) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1f2JIc-0005JF-Kg for qemu-devel@nongnu.org; Sat, 31 Mar 2018 12:24:14 -0400 Received: by mail-lf0-x241.google.com with SMTP id x70-v6so9017605lfa.0 for ; Sat, 31 Mar 2018 09:24:14 -0700 (PDT) From: Max Filippov Date: Sat, 31 Mar 2018 09:23:36 -0700 Message-Id: <20180331162336.20158-1-jcmvbkbc@gmail.com> Subject: [Qemu-devel] [PATCH] linux-user: fix mq_getsetattr implementation List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Max Filippov , Lionel Landwerlin , "Kirill A . Shutemov" , Riku Voipio , Aurelien Jarno , Laurent Vivier 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 3rd argument. Use get_errno to set errno value. This fixes test rt/tst-mqueue2 from the glibc testsuite. Cc: Lionel Landwerlin Cc: Kirill A. Shutemov Cc: Riku Voipio Cc: Aurelien Jarno Cc: Laurent Vivier Signed-off-by: Max Filippov --- linux-user/syscall.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 18ea79140f16..8b364551c311 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -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 (arg3 != 0) { + copy_to_user_mq_attr(arg3, &posix_mq_attr_out); + } + ret = get_errno(ret); } break; #endif -- 2.11.0