From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id YGZQIKxS/F/nLQAA0tVLHw (envelope-from ) for ; Mon, 11 Jan 2021 13:29:16 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id MLMeHKxS/F+XUQAAB5/wlQ (envelope-from ) for ; Mon, 11 Jan 2021 13:29:16 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id E0AFC9404CA for ; Mon, 11 Jan 2021 13:29:15 +0000 (UTC) Received: from localhost ([::1]:39656 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kyxFy-0005lO-R7 for larch@yhetil.org; Mon, 11 Jan 2021 08:29:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48566) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kyxFm-0005j7-LU for bug-guix@gnu.org; Mon, 11 Jan 2021 08:29:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:44558) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kyxFm-00062g-Dc for bug-guix@gnu.org; Mon, 11 Jan 2021 08:29:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kyxFm-0005ux-93 for bug-guix@gnu.org; Mon, 11 Jan 2021 08:29:02 -0500 X-Loop: help-debbugs@gnu.org Subject: bug#45716: gnu: qemu: Fix ioclt(=?UTF-8?Q?=E2=80=A6, ?= SIOCGIFCONF, =?UTF-8?Q?=E2=80=A6?=) for emulated 64 bit architectures. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Mon, 11 Jan 2021 13:29:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45716 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: Stefan Received: via spool by 45716-submit@debbugs.gnu.org id=B45716.161037171322692 (code B ref 45716); Mon, 11 Jan 2021 13:29:02 +0000 Received: (at 45716) by debbugs.gnu.org; 11 Jan 2021 13:28:33 +0000 Received: from localhost ([127.0.0.1]:56104 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kyxFI-0005tv-UG for submit@debbugs.gnu.org; Mon, 11 Jan 2021 08:28:33 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55358) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kyxFH-0005th-1H for 45716@debbugs.gnu.org; Mon, 11 Jan 2021 08:28:31 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:36679) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kyxF9-0005zq-Oy; Mon, 11 Jan 2021 08:28:24 -0500 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=57938 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1kyxF8-0006yI-9Z; Mon, 11 Jan 2021 08:28:23 -0500 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <19CC6F6C-98CA-4218-A9E7-FE7AC751E924@vodafonemail.de> <5A46F4E0-9823-4614-A7BC-865F9D7C0FB7@vodafonemail.de> <20210108040445.1444c372@scratchpost.org> <18056543-1468-4B69-BFA8-F28CCA234168@vodafonemail.de> <4928FA00-C99D-4C66-877E-308D0B8F3228@vodafonemail.de> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 22 =?UTF-8?Q?Niv=C3=B4se?= an 229 de la =?UTF-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Mon, 11 Jan 2021 14:28:21 +0100 In-Reply-To: <4928FA00-C99D-4C66-877E-308D0B8F3228@vodafonemail.de> (Stefan's message of "Sat, 9 Jan 2021 19:01:39 +0100") Message-ID: <87eeireh6y.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: 45716@debbugs.gnu.org Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -2.85 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of bug-guix-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=bug-guix-bounces@gnu.org X-Migadu-Queue-Id: E0AFC9404CA X-Spam-Score: -2.85 X-Migadu-Scanner: scn0.migadu.com X-TUID: 3IrtKmHcPgUw Hi Stefan, Stefan skribis: > * gnu/packages/virtualization.scm (qemu): Add a snippet to fix a bug in t= he > do_ioctl_ifconf() function of qemu to make ioclt(=E2=80=A6, SIOCGIFCONF, = =E2=80=A6) work for > emulated 64 bit architectures. > > The sizeof(struct ifreq) is 40 for 64 bit and 32 for 32 bit architectures. > This structure contains a union of other structures, of which struct ifmap > is the biggest for 64 bit architectures. Calling ioclt(=E2=80=A6, SIOCGIF= CONF, =E2=80=A6) > fills a struct sockaddr of that union, and do_ioctl_ifconf() only conside= red > that struct sockaddr for the size of the union, which has the same size as > struct ifmap on 32 bit architectures. So do_ioctl_ifconf() assumed a wrong > size of 32 for struct ifreq instead of the correct size of 40 on 64 bit > architectures. > > The fix makes do_ioctl_ifconf() handle struct ifmap as the biggest part of > the union, treating struct ifreq with the correct size. > > This fixes (@ (guix build syscalls) network-interface-names) when used in > emulated 64 bit architectures. Woow, good catch! > + (modules '((guix build utils))) > + (snippet > + '(begin > + (substitute* '("linux-user/syscall.c") > + (("^([[:blank:]]*)const argtype ifreq_arg_type.*$" l= ine indent) > + (string-append line indent > + "const argtype ifreq_max_type[] =3D = { MK_STRUCT(STRUCT_ifmap_ifreq) };\n")) > + (("^([[:blank:]]*)target_ifreq_size[[:blank:]]=3D.*$= " _ indent) > + (string-append indent "target_ifreq_size =3D thunk_= type_size(ifreq_max_type, 0);"))) > + #t)))) Could you move the explanation as a comment above the =E2=80=98substitute*= =E2=80=99 form, and/or link to the upstream bug report/discussion/submission? Thank you! Ludo=E2=80=99.