From nobody Tue Nov 4 18:45:57 2025 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1530554012308406.127683878222; Mon, 2 Jul 2018 10:53:32 -0700 (PDT) Received: from localhost ([::1]:34652 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fa311-0006Qh-HS for importer@patchew.org; Mon, 02 Jul 2018 13:53:31 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60781) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fa2yp-0005GX-FU for qemu-devel@nongnu.org; Mon, 02 Jul 2018 13:51:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fa2yl-0003sa-Hu for qemu-devel@nongnu.org; Mon, 02 Jul 2018 13:51:15 -0400 Received: from mail-vk0-x244.google.com ([2607:f8b0:400c:c05::244]:42873) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fa2yl-0003sC-Dj for qemu-devel@nongnu.org; Mon, 02 Jul 2018 13:51:11 -0400 Received: by mail-vk0-x244.google.com with SMTP id s187-v6so9627915vke.9 for ; Mon, 02 Jul 2018 10:51:11 -0700 (PDT) Received: from x1.local ([138.117.48.222]) by smtp.gmail.com with ESMTPSA id j22-v6sm993152uag.15.2018.07.02.10.51.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 02 Jul 2018 10:51:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rV9uM/oOCzpA96uLnU9I4KUXvhXXj61MP50Ecxwg7jU=; b=R+3AvP23PW+bTRC0YieKxVElocCG4Z4tSZxHuLAi8Qe2xvTqY6iH9o9mx1LBGCVB0+ 5NQ1owoxwzTQNppvWfscKfu0B5P21671ne8ZthuYK5Axvd0ushnIpNaHtZUiXORc1ftH pkPF1w3PN5sWvM/lAc4MmCNqWgu1qJo0epWZnXub2wSfamAC8ysDWOcev+B5Md0ZoDhp vVOUHgz73H5DrZJuX3NUCF/HAtmsT7b55wA7aZqSv0own/MIWmhiaNvFTXx/rUCQgFrl NJHMRp+qdt9hZAvTS50ACpeYdQ4JWxkCVt8093+DCV7GprjwUcn2DpK+nbpk/uLjNq4X gYAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=rV9uM/oOCzpA96uLnU9I4KUXvhXXj61MP50Ecxwg7jU=; b=WgQ5GpPfx7/g5hP/dd6E7N/bt/2fv7JObWXvp6O56aldjLPbbumYkNb5JwcuwCTK+q REwJqwWHXRR+JwVcgqIk9SEXKy2fJBqkOyQ7U+dfLgQnDfybYgJGPw4R4/ZJl5573D7Z +bUgpmcNlCnYi+ZcZIlPj+gp4vKJM5wp3+V5/BMeAJybSIGa8HHSt9klmPq/hvwYj2iB oSmMURdC5hU+BZrP+Q7b2Sps35gRVMF9LJVEbrlJdtQ/Xhz6HBJ9ojp3G8H/6f0LQJjQ P7gBp6Yg9w/vPOoLZydaZ3NBTScQVivpdZJGclzVOM3SAeSrMCoaimUN4PsWObktvd3b mgZA== X-Gm-Message-State: APt69E18FwiMHzL5zbcpHUcaUSeloKK8h48VXXRpOzeP84iFlQXJ7yin pbzQgD+iFwKq56nDoRs2Eco= X-Google-Smtp-Source: AAOMgpeAtxXZQMXstV6j+JC6A79fo5Kv/kd9EjbofOtPkFin8VC8Eho6yvmJfc9kFtMAxT2QkutN9A== X-Received: by 2002:a1f:41d4:: with SMTP id o203-v6mr15368792vka.149.1530553870731; Mon, 02 Jul 2018 10:51:10 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Laurent Vivier Date: Mon, 2 Jul 2018 14:50:28 -0300 Message-Id: <20180702175030.18621-12-f4bug@amsat.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180702175030.18621-1-f4bug@amsat.org> References: <20180702175030.18621-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400c:c05::244 Subject: [Qemu-devel] [PATCH v3 11/13] linux-user/strace: Add print_sockaddr_ptr() to handle plain/pointer addrlen X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Guido=20G=C3=BCnther?= , Riku Voipio , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_6 Z_629925259 SPT_0 While very similar to send()/recv(), the format used by sendto()/recvfrom() is slightly different: the 'addrlen' is not a plain sockaddr_t but a pointer to it. Split the current function to handle both formats. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Tested-By: Guido G=C3=BCnther --- linux-user/strace.c | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/linux-user/strace.c b/linux-user/strace.c index 85a1efef32..9ab11059e4 100644 --- a/linux-user/strace.c +++ b/linux-user/strace.c @@ -68,6 +68,7 @@ UNUSED static void print_timezone(abi_ulong, int); UNUSED static void print_number(abi_long, int); UNUSED static void print_signal(abi_ulong, int); UNUSED static void print_sockaddr(abi_ulong addr, abi_long addrlen, int); +UNUSED static void print_sockaddr_ptr(abi_ulong addr, abi_long addrlen_ptr= , int); UNUSED static void print_socket_domain(int domain); UNUSED static void print_socket_type(int type); UNUSED static void print_socket_protocol(int domain, int type, int protoco= l); @@ -336,7 +337,8 @@ static void print_siginfo(const target_siginfo_t *tinfo) } =20 static void -print_sockaddr(abi_ulong addr, abi_long addrlen, int last) +print_sockaddr_ex(abi_ulong addr, abi_long addrlen, + bool addrlen_is_ptr, int last) { struct target_sockaddr *sa; int i; @@ -418,7 +420,29 @@ print_sockaddr(abi_ulong addr, abi_long addrlen, int l= ast) } else { print_raw_param("0x"TARGET_ABI_FMT_lx, addr, 0); } - gemu_log(", "TARGET_ABI_FMT_ld"%s", addrlen, get_comma(last)); + gemu_log(", %s"TARGET_ABI_FMT_ld"%s%s", + (addrlen_is_ptr ? "[" : ""), addrlen, + (addrlen_is_ptr ? "]" : ""), get_comma(last)); +} + +static void +print_sockaddr(abi_ulong addr, abi_long addrlen, int last) +{ + print_sockaddr_ex(addr, addrlen, false, last); +} + +static void +print_sockaddr_ptr(abi_ulong addr, abi_long addrlen_ptr, int last) +{ + abi_ulong addrlen; + + if (!addr) { + print_sockaddr_ex(0, 0, false, last); + return; + } + + get_user_ual(addrlen, addrlen_ptr); + print_sockaddr_ex(addr, addrlen, true, last); } =20 static void --=20 2.18.0