From nobody Wed Feb 11 03:03:49 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) 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=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1516799062907684.4450733589412; Wed, 24 Jan 2018 05:04:22 -0800 (PST) Received: from localhost ([::1]:47692 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eeKit-0004S5-3W for importer@patchew.org; Wed, 24 Jan 2018 08:04:15 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50894) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eeKgS-00037y-Ki for qemu-devel@nongnu.org; Wed, 24 Jan 2018 08:01:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eeKgN-0005PF-5E for qemu-devel@nongnu.org; Wed, 24 Jan 2018 08:01:44 -0500 Received: from mail-qt0-x244.google.com ([2607:f8b0:400d:c0d::244]:36098) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eeKgN-0005Or-1Z for qemu-devel@nongnu.org; Wed, 24 Jan 2018 08:01:39 -0500 Received: by mail-qt0-x244.google.com with SMTP id z11so10022629qtm.3 for ; Wed, 24 Jan 2018 05:01:38 -0800 (PST) Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id q26sm2037495qtl.68.2018.01.24.05.01.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Jan 2018 05:01:37 -0800 (PST) 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=WkRJ6GXBFcjzp4hxFd1hrY4KSCkK/SqnVyDNyQLCOhM=; b=dZ/F5MslsMmG8W9BTxwBy7YkCTEAReRP6OJdrM//m9InevxVnGzWj/ocQtt4cMaBsM Jfb21xylDZabSeQTT808nvkzI2ZgZYUl3y7T+Xze0LDKfGAnjBt2H6ntzUNkEfPHNOo7 4zhWl3ePiQ7eZXuzFzojHqHKJ4eQ/6hAp9da+xDQv81DQ8W44KgAyPEx+EvQxZn6gg+U gyz3bSR5nd2XF+H0obBY0yeRiRrWAvLtmtbCNfnKVfYg+TvTwyh3QitXqE0DvvC8zdvY iAQFyNtG6jiQv1yFufo7Mm+s3pC8tBx+FRowYbCokYZJTOOjWvXa6fuYPE/DFOHcowQM f8sA== 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=WkRJ6GXBFcjzp4hxFd1hrY4KSCkK/SqnVyDNyQLCOhM=; b=G67J+CAZkgkDhALYrRZrA8RJDUUzle2yhxGW/atEtX6LhB1N56kEJb8zpzJJgWQCLA SXR+L3tEbbkaKbHFCkToudo3yWn6vi1fopS5SWWO5o2eizvxmfabc9rElqBJpYw6sQXc HdhxkXW+i8e6mrTETNwdfCMNcqFuS14dp9V/MeAyoqSU0YSHuCOvsvseTtBHrVqz5Qwl RGyAhpg0QCXHA5/ndPJABR/ZvjfYnnzYTSFsejcRgHiYUiwlNF1wW6FxRH31Rie5SQWO cJE/OchF/lWnU2IDS2Y4XHafC7p/gidWKQWbsuWZrCX2hHqR0TvOdtCaX+bp/juRAcFe QthQ== X-Gm-Message-State: AKwxytfujQ4lifRulxaoRApV7Cig34Yu/u5pVHflntOJIGdzvjjOQbTL 4zyvaU0UMFxtpnLH8C4Su2E= X-Google-Smtp-Source: AH8x227aygtmKZWBCRcJTSIMLps12lL6GNJRdO9m5jn80UwOmuC928X6B+8ugwzg6fiF+X8+BnEtyw== X-Received: by 10.200.46.47 with SMTP id r44mr4264603qta.8.1516798898445; Wed, 24 Jan 2018 05:01:38 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Riku Voipio , Laurent Vivier Date: Wed, 24 Jan 2018 10:01:18 -0300 Message-Id: <20180124130126.20871-4-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180124130126.20871-1-f4bug@amsat.org> References: <20180124130126.20871-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:400d:c0d::244 Subject: [Qemu-devel] [PATCH 03/11] 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?= , =?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_0 Z_629925259 SPT_0 since this argument differs between sendto()/recvfrom() Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- linux-user/strace.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/linux-user/strace.c b/linux-user/strace.c index e7272f4ede..9726d9b378 100644 --- a/linux-user/strace.c +++ b/linux-user/strace.c @@ -335,12 +335,15 @@ static void print_siginfo(const target_siginfo_t *tin= fo) } =20 static void -print_sockaddr(abi_ulong addr, abi_long addrlen) +print_sockaddr_ptr(abi_ulong addr, abi_long addrlen, bool addrlen_ptr) { struct target_sockaddr *sa; int i; int sa_family; =20 + if (addrlen_ptr) { + get_user_ual(addrlen, addrlen); + } sa =3D lock_user(VERIFY_READ, addr, addrlen, 1); if (sa) { sa_family =3D tswap16(sa->sa_family); @@ -417,7 +420,17 @@ print_sockaddr(abi_ulong addr, abi_long addrlen) } else { print_raw_param("0x"TARGET_ABI_FMT_lx, addr, 0); } - gemu_log(", "TARGET_ABI_FMT_ld, addrlen); + if (addrlen_ptr) { + gemu_log(", ["TARGET_ABI_FMT_ld"]", addrlen); + } else { + gemu_log(", "TARGET_ABI_FMT_ld, addrlen); + } +} + +static void +print_sockaddr(abi_ulong addr, abi_long addrlen) +{ + print_sockaddr_ptr(addr, addrlen, false); } =20 static void --=20 2.15.1