{"id":2230889,"url":"http://patchwork.ozlabs.org/api/1.1/patches/2230889/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260430071922.15341-4-deller@kernel.org/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.1/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20260430071922.15341-4-deller@kernel.org>","date":"2026-04-30T07:19:21","name":"[PULL,3/4] linux-user: Allow getsockopt() with NULL optval address","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"7d4c89f76fddf5fc4b59bba6b9d528514b4e948e","submitter":{"id":87076,"url":"http://patchwork.ozlabs.org/api/1.1/people/87076/?format=json","name":"Helge Deller","email":"deller@kernel.org"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260430071922.15341-4-deller@kernel.org/mbox/","series":[{"id":502224,"url":"http://patchwork.ozlabs.org/api/1.1/series/502224/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=502224","date":"2026-04-30T07:19:19","name":"[PULL,1/4] linux-user: Add missing CDROM ioctls","version":1,"mbox":"http://patchwork.ozlabs.org/series/502224/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2230889/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2230889/checks/","tags":{},"headers":{"Return-Path":"<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256\n header.s=k20201202 header.b=DQNWEbmg;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists1p.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)"],"Received":["from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4g5ltw1Wpgz1yGq\n\tfor <incoming@patchwork.ozlabs.org>; Thu, 30 Apr 2026 17:20:24 +1000 (AEST)","from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists1p.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from <qemu-devel-bounces@nongnu.org>)\n\tid 1wILgN-0003ZR-8J; Thu, 30 Apr 2026 03:19:35 -0400","from eggs.gnu.org ([2001:470:142:3::10])\n by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from <deller@kernel.org>) id 1wILgL-0003YY-40\n for qemu-devel@nongnu.org; Thu, 30 Apr 2026 03:19:33 -0400","from tor.source.kernel.org ([172.105.4.254])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from <deller@kernel.org>) id 1wILgJ-00013J-Ey\n for qemu-devel@nongnu.org; Thu, 30 Apr 2026 03:19:32 -0400","from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58])\n by tor.source.kernel.org (Postfix) with ESMTP id AF94D61145;\n Thu, 30 Apr 2026 07:19:30 +0000 (UTC)","by smtp.kernel.org (Postfix) with ESMTPSA id 52D4CC2BCB4;\n Thu, 30 Apr 2026 07:19:29 +0000 (UTC)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org;\n s=k20201202; t=1777533570;\n bh=2zHQrRG0goJ++Rc1kkqjW925uojIri28hDyU+Vdmp0E=;\n h=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n b=DQNWEbmgiLeqf+qHyLRMuCeUJYh43dPEyOd7H+o/oqDKy2y4OhwfFHM7bblXV0Psm\n BD+SGyWt/1bRU7e644sTdQbdmF6ZjV4xX9vdC/b2WFcxW4ecKvz9gh1UJDkJZt0SeG\n au2indjQz6DKV0RijkTzTTq8aSkm1NT9ppTPwbUt1TjI++qmlbqI+2Em4aVDYnJYhX\n fudT1OYOgzSyNd7RgpZaqxH4vnOXEgbtVFipQaOX+mKPCGJk+1vh0Ajc4e31xOdtTn\n iHDpcdO3E8P8RQlSEr9nc53eSSPKxJDgh3HrJMAQlDcyywN5GKi/ZsYuGktc7lWKHk\n /cNI1jFmG2AFA==","From":"Helge Deller <deller@kernel.org>","To":"qemu-devel@nongnu.org","Cc":"Laurent Vivier <laurent@vivier.eu>, Helge Deller <deller@gmx.de>,\n Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com>","Subject":"[PULL 3/4] linux-user: Allow getsockopt() with NULL optval address","Date":"Thu, 30 Apr 2026 09:19:21 +0200","Message-ID":"<20260430071922.15341-4-deller@kernel.org>","X-Mailer":"git-send-email 2.53.0","In-Reply-To":"<20260430071922.15341-1-deller@kernel.org>","References":"<20260430071922.15341-1-deller@kernel.org>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Received-SPF":"pass client-ip=172.105.4.254; envelope-from=deller@kernel.org;\n helo=tor.source.kernel.org","X-Spam_score_int":"-20","X-Spam_score":"-2.1","X-Spam_bar":"--","X-Spam_report":"(-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001,\n DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,\n SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no","X-Spam_action":"no action","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"qemu development <qemu-devel.nongnu.org>","List-Unsubscribe":"<https://lists.nongnu.org/mailman/options/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>","List-Archive":"<https://lists.nongnu.org/archive/html/qemu-devel>","List-Post":"<mailto:qemu-devel@nongnu.org>","List-Help":"<mailto:qemu-devel-request@nongnu.org?subject=help>","List-Subscribe":"<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=subscribe>","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org"},"content":"From: Helge Deller <deller@gmx.de>\n\nSome programs test availability of socket options by asking for the\nvalue with an NULL optval address, which currenrly always trigger an\nEFAULT in qemu.  Fix it by allowing a NULL address, in the same manner\nas the Linux kernel on physical machines.\n\nResolves: https://gitlab.com/qemu-project/qemu/-/work_items/2390\nSigned-off-by: Helge Deller <deller@gmx.de>\nReviewed-by: Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com>\n---\n linux-user/syscall.c | 50 +++++++++++++++++++++++++-------------------\n 1 file changed, 28 insertions(+), 22 deletions(-)","diff":"diff --git a/linux-user/syscall.c b/linux-user/syscall.c\nindex 4594909242..d68edb7afd 100644\n--- a/linux-user/syscall.c\n+++ b/linux-user/syscall.c\n@@ -2644,6 +2644,10 @@ get_timeout:\n             if (ret < 0) {\n                 return ret;\n             }\n+            /* special case: destination address is NULL, return 0 */\n+            if (optval_addr) {\n+                len = 0;\n+            }\n             if (len == sizeof(struct target__kernel_sock_timeval)) {\n                 if (copy_to_user_timeval64(optval_addr, &tv)) {\n                     return -TARGET_EFAULT;\n@@ -2844,7 +2848,10 @@ get_timeout:\n         }\n         if (len > lv)\n             len = lv;\n-        if (len == 4) {\n+        if (!optval_addr) {\n+            /* writing to NULL does not give error */\n+            len = 0;\n+        } else if (len == 4) {\n             if (put_user_u32(val, optval_addr))\n                 return -TARGET_EFAULT;\n         } else {\n@@ -2877,18 +2884,24 @@ get_timeout:\n                 return -TARGET_EINVAL;\n             lv = sizeof(lv);\n             ret = get_errno(getsockopt(sockfd, level, optname, &val, &lv));\n+write_ret:\n             if (ret < 0)\n                 return ret;\n-            if (len < sizeof(int) && len > 0 && val >= 0 && val < 255) {\n+            if (!optval_addr) {\n+                len = 0;\n+            } else if (len < sizeof(int) && len > 0 && val >= 0 && val < 255) {\n                 len = 1;\n-                if (put_user_u32(len, optlen)\n-                    || put_user_u8(val, optval_addr))\n+                if (put_user_u8(val, optval_addr)) {\n                     return -TARGET_EFAULT;\n+                }\n             } else {\n                 if (len > sizeof(int))\n                     len = sizeof(int);\n-                if (put_user_u32(len, optlen)\n-                    || put_user_u32(val, optval_addr))\n+                if (put_user_u32(val, optval_addr)) {\n+                    return -TARGET_EFAULT;\n+                }\n+            }\n+            if (put_user_u32(len, optlen)) {\n                     return -TARGET_EFAULT;\n             }\n             break;\n@@ -2939,20 +2952,7 @@ get_timeout:\n                 return -TARGET_EINVAL;\n             lv = sizeof(lv);\n             ret = get_errno(getsockopt(sockfd, level, optname, &val, &lv));\n-            if (ret < 0)\n-                return ret;\n-            if (len < sizeof(int) && len > 0 && val >= 0 && val < 255) {\n-                len = 1;\n-                if (put_user_u32(len, optlen)\n-                    || put_user_u8(val, optval_addr))\n-                    return -TARGET_EFAULT;\n-            } else {\n-                if (len > sizeof(int))\n-                    len = sizeof(int);\n-                if (put_user_u32(len, optlen)\n-                    || put_user_u32(val, optval_addr))\n-                    return -TARGET_EFAULT;\n-            }\n+            goto write_ret;\n             break;\n         default:\n             ret = -TARGET_ENOPROTOOPT;\n@@ -2986,8 +2986,14 @@ get_timeout:\n             if (ret < 0) {\n                 return ret;\n             }\n-            if (put_user_u32(lv, optlen)\n-                || put_user_u32(val, optval_addr)) {\n+            if (optval_addr) {\n+                if (put_user_u32(val, optval_addr)) {\n+                    return -TARGET_EFAULT;\n+                }\n+            } else {\n+                lv = 0;\n+            }\n+            if (put_user_u32(lv, optlen)) {\n                 return -TARGET_EFAULT;\n             }\n             break;\n","prefixes":["PULL","3/4"]}