From patchwork Sun Jan 27 12:04:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 156691 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp2333654jaa; Sun, 27 Jan 2019 04:12:08 -0800 (PST) X-Google-Smtp-Source: ALg8bN5H5xBNkYsCRKd9S0oZlBUoFu01ZUDOVGMN1JDO4XqcnjDfiHx93mhtvL4iFufURiErFd8H X-Received: by 2002:a7b:cb18:: with SMTP id u24mr12813129wmj.138.1548591127909; Sun, 27 Jan 2019 04:12:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548591127; cv=none; d=google.com; s=arc-20160816; b=guOIEZyn07CjF/mRrw42xEIuCkgVQQLBDhqVdIuDFs3usWHzuPGqCi3eFmBHddDn/L b+SfrJlQtnqppVK5h8ouDA+mRRXnpZyuESAc6P1XCcrxaOeXrfCDjLVS+3ehzsjv16V0 DXX704N2/3J2p1pJZEL3H8I/uUlrhdecf/wzrbIXgv1rBkI+dx1ynp5c6S2qqVoGKO+/ A5b6yOvw+pqJinkXrwD7lZDo6dYS7SI3IagdBdsQNM4URReGfbVIb8/hcZaykxqc8f+d t5BW5855p6aMtUSiLOSsmZPLKqbL2GWjpFKL0ZXpdcr93ddhrBFkbOCMD2hBCZISZtdX jqGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from; bh=KcCeF72dxSP15VPU3Umy6P5HvUDSDyyWy9IScFQfC/4=; b=o38I+GJ/6M/qRcVUCaUZB2Aynw7/4swuMvPrvnT6mMa2NuOcKHRPOvfoKV2B8By/1m 7q3j1L65HYHg76NNPR+d6jPMcTOi8p67sCINdECZZEdS2Q/TyuX68z3hETfS9NupzjJE /ma1TLmQdtsiLKt+Equk6NnLbzZK4fJggai2bTrethNHtxbPN3NUwfZHawxxW3b7pHyD UFH4r9o0tlL5ABxMfQ0ypIChWZE8Uak5FbZyntCClIVUHtTAk6cDd+sRwRdRD+B/DL4T lwvIWfx6N0GK983BIR9vnTZfaF7Gxe7+KIuEtgIY2W9DnBDxJUytOxwvzNkxD6wcc5+j wjnw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id w72si45482370wme.155.2019.01.27.04.12.07 for (version=TLS1 cipher=AES128-SHA bits=128/128); Sun, 27 Jan 2019 04:12:07 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Received: from localhost ([127.0.0.1]:44673 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gnjIE-0006LU-Pm for patch@linaro.org; Sun, 27 Jan 2019 07:12:06 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52493) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gnjCB-0001Nn-Gv for qemu-devel@nongnu.org; Sun, 27 Jan 2019 07:05:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gnjCA-0007P1-AS for qemu-devel@nongnu.org; Sun, 27 Jan 2019 07:05:51 -0500 Received: from hera.aquilenet.fr ([2a0c:e300::1]:43376) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gnjC9-0007LM-Va for qemu-devel@nongnu.org; Sun, 27 Jan 2019 07:05:50 -0500 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id B0DF57BF8; Sun, 27 Jan 2019 13:05:33 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 4K9QxPaPlccU; Sun, 27 Jan 2019 13:05:32 +0100 (CET) Received: from function (lfbn-1-11161-124.w86-213.abo.wanadoo.fr [86.213.235.124]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 6288A7CD4; Sun, 27 Jan 2019 13:05:28 +0100 (CET) Received: from samy by function with local (Exim 4.92-RC4) (envelope-from ) id 1gnjBm-00042Z-P3; Sun, 27 Jan 2019 13:05:26 +0100 From: Samuel Thibault To: qemu-devel@nongnu.org Date: Sun, 27 Jan 2019 13:04:57 +0100 Message-Id: <20190127120526.15457-3-samuel.thibault@ens-lyon.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190127120526.15457-1-samuel.thibault@ens-lyon.org> References: <20190127120526.15457-1-samuel.thibault@ens-lyon.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a0c:e300::1 Subject: [Qemu-devel] [PULL 02/31] slirp: Avoid marking naturally packed structs as QEMU_PACKED 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: Peter Maydell , Samuel Thibault , stefanha@redhat.com, jan.kiszka@siemens.com Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Peter Maydell Various ipv6 structs in the slirp headers are marked QEMU_PACKED, but they are actually naturally aligned and will have no padding in them. Instead of marking them with the 'packed' attribute, assert at compile time that they are the size we expect. This allows us to take the address of fields within the structs without risking undefined behaviour, and suppresses clang -Waddress-of-packed-member warnings. Signed-off-by: Peter Maydell Reviewed-by: Eric Blake Signed-off-by: Samuel Thibault --- slirp/ip6.h | 12 ++++++++++-- slirp/ip6_icmp.h | 20 +++++++++++++++----- 2 files changed, 25 insertions(+), 7 deletions(-) -- 2.20.1 diff --git a/slirp/ip6.h b/slirp/ip6.h index 14e9c78735..1e3e329ce6 100644 --- a/slirp/ip6.h +++ b/slirp/ip6.h @@ -133,7 +133,7 @@ struct ip6 { uint8_t ip_nh; /* next header */ uint8_t ip_hl; /* hop limit */ struct in6_addr ip_src, ip_dst; /* source and dest address */ -} QEMU_PACKED; +}; /* * IPv6 pseudo-header used by upper-layer protocols @@ -145,7 +145,15 @@ struct ip6_pseudohdr { uint16_t ih_zero_hi; /* zero */ uint8_t ih_zero_lo; /* zero */ uint8_t ih_nh; /* next header */ -} QEMU_PACKED; +}; +/* + * We don't want to mark these ip6 structs as packed as they are naturally + * correctly aligned; instead assert that there is no stray padding. + * If we marked the struct as packed then we would be unable to take + * the address of any of the fields in it. + */ +QEMU_BUILD_BUG_ON(sizeof(struct ip6) != 40); +QEMU_BUILD_BUG_ON(sizeof(struct ip6_pseudohdr) != 40); #endif diff --git a/slirp/ip6_icmp.h b/slirp/ip6_icmp.h index 32b0914055..2ad2b75e67 100644 --- a/slirp/ip6_icmp.h +++ b/slirp/ip6_icmp.h @@ -48,12 +48,16 @@ struct ndp_ra { /* Router Advertisement Message */ uint16_t lifetime; /* Router Lifetime */ uint32_t reach_time; /* Reachable Time */ uint32_t retrans_time; /* Retrans Timer */ -} QEMU_PACKED; +}; + +QEMU_BUILD_BUG_ON(sizeof(struct ndp_ra) != 12); struct ndp_ns { /* Neighbor Solicitation Message */ uint32_t reserved; struct in6_addr target; /* Target Address */ -} QEMU_PACKED; +}; + +QEMU_BUILD_BUG_ON(sizeof(struct ndp_ns) != 20); struct ndp_na { /* Neighbor Advertisement Message */ #if G_BYTE_ORDER == G_BIG_ENDIAN @@ -72,13 +76,17 @@ struct ndp_na { /* Neighbor Advertisement Message */ reserved_lo:24; #endif struct in6_addr target; /* Target Address */ -} QEMU_PACKED; +}; + +QEMU_BUILD_BUG_ON(sizeof(struct ndp_na) != 20); struct ndp_redirect { uint32_t reserved; struct in6_addr target; /* Target Address */ struct in6_addr dest; /* Destination Address */ -} QEMU_PACKED; +}; + +QEMU_BUILD_BUG_ON(sizeof(struct ndp_redirect) != 36); /* * Structure of an icmpv6 header. @@ -103,7 +111,9 @@ struct icmp6 { #define icmp6_nns icmp6_body.ndp_ns #define icmp6_nna icmp6_body.ndp_na #define icmp6_redirect icmp6_body.ndp_redirect -} QEMU_PACKED; +}; + +QEMU_BUILD_BUG_ON(sizeof(struct icmp6) != 40); #define ICMP6_MINLEN 4 #define ICMP6_ERROR_MINLEN 8 From patchwork Sun Jan 27 12:04:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 156690 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp2333303jaa; Sun, 27 Jan 2019 04:11:41 -0800 (PST) X-Google-Smtp-Source: ALg8bN4xBySpT0GD9SRe1LJyK0n6/w23CcxOv6go9hOv0kwrdJ7XFLK/zdv+5PU0cKCK02hS4jcA X-Received: by 2002:adf:fe11:: with SMTP id n17mr17650981wrr.329.1548591101477; Sun, 27 Jan 2019 04:11:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548591101; cv=none; d=google.com; s=arc-20160816; b=FpU60OL9RXUoC0JiXtXxNwkZSl9fGzUncp1cXjdQNywkW30AQZ65rx5FC78h/qtXZo KGUMWF2F53uupZzyQdOtIXMQJESkhf/7oHL8AkmVcQOV5EqmwRFjvsFvlzF6QfWYMumL wvGtlCnm7/It13K5j6TAv1N6CeQ/HSHA2Y8QAp+28OaiapQfce+BYuCRVSsZ3D+bfX6f RZOMCy0ZVm0Tucg2aadI5X4gaZFFwES6uLtsy34Wh4qhwLcIp0f2D2wmcAh+nCt2Ud4P oEmElhKWJnrYv880R0bNp1JoiOsEd9VXAZcFYtqhJtks/Erq/fTBeUaVP/0Xs/I1uBln KazA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from; bh=c37Oo6eLvoOcn14oMVc6NjO4Og2IlcGPMnzcEwlvs00=; b=VP6tfpg/ZUdhUO2l9cYAvTRo6266HAvYYcmXNKHkQ95VVaNh0HVGBd0Cwtu7YWqZZA ExBlqPqqPxTWG4U41k9D/eX9ntnLjEE5d2cSvzuBpihtwXyBfAHugdzRdjvpGmnuorDo mT9y+c5pxBJAvZOsMAn4ir76mqTXbrnvdDAX+fKu52GSAF//hpzje/XHkypqt85Plj7b 7bT37JOnZZplCVX6O5S85KQ6qSPS2MI6HFoUC3ZmNTfJnSMyZlvMSb0zeJAIp/r2n+Hy Stw2ubayIoY0BmrsaS9s2yWKwd8dE+C25uAoXfQRT+my4hJ8ZxnH5hucJUzMnDYBdbQ9 2vpQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id m13si12079847wrs.411.2019.01.27.04.11.41 for (version=TLS1 cipher=AES128-SHA bits=128/128); Sun, 27 Jan 2019 04:11:41 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Received: from localhost ([127.0.0.1]:44660 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gnjHo-000589-CD for patch@linaro.org; Sun, 27 Jan 2019 07:11:40 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52526) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gnjCC-0001OQ-FX for qemu-devel@nongnu.org; Sun, 27 Jan 2019 07:05:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gnjCB-0007Qu-Af for qemu-devel@nongnu.org; Sun, 27 Jan 2019 07:05:52 -0500 Received: from hera.aquilenet.fr ([185.233.100.1]:46440) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gnjCB-0007Ow-2c for qemu-devel@nongnu.org; Sun, 27 Jan 2019 07:05:51 -0500 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id AA25F7CD4; Sun, 27 Jan 2019 13:05:36 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8I5g0JyUXLmJ; Sun, 27 Jan 2019 13:05:35 +0100 (CET) Received: from function (lfbn-1-11161-124.w86-213.abo.wanadoo.fr [86.213.235.124]) by hera.aquilenet.fr (Postfix) with ESMTPSA id AED727CDA; Sun, 27 Jan 2019 13:05:28 +0100 (CET) Received: from samy by function with local (Exim 4.92-RC4) (envelope-from ) id 1gnjBm-00042b-Pz; Sun, 27 Jan 2019 13:05:26 +0100 From: Samuel Thibault To: qemu-devel@nongnu.org Date: Sun, 27 Jan 2019 13:04:58 +0100 Message-Id: <20190127120526.15457-4-samuel.thibault@ens-lyon.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190127120526.15457-1-samuel.thibault@ens-lyon.org> References: <20190127120526.15457-1-samuel.thibault@ens-lyon.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 185.233.100.1 Subject: [Qemu-devel] [PULL 03/31] slirp: Don't mark struct ipq or struct ipasfrag as packed 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: Peter Maydell , Samuel Thibault , stefanha@redhat.com, jan.kiszka@siemens.com Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Peter Maydell There is no reason to mark the struct ipq and struct ipasfrag as packed: they are naturally aligned anyway, and are not representing any on-the-wire packet format. Indeed they vary in size depending on the size of pointers on the host system, because the 'struct qlink' members include 'void *' fields. Dropping the 'packed' annotation fixes clang -Waddress-of-packed-member warnings and probably lets the compiler generate better code too. The only thing we do care about in the layout of the struct is that the frag_link matches up with the ipf_link of the struct ipasfrag, as documented in the comment on that struct; assert at build time that this is the case. Signed-off-by: Peter Maydell Reviewed-by: Eric Blake Signed-off-by: Samuel Thibault --- slirp/ip.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) -- 2.20.1 diff --git a/slirp/ip.h b/slirp/ip.h index 243b6c8b24..20614f3b53 100644 --- a/slirp/ip.h +++ b/slirp/ip.h @@ -217,7 +217,7 @@ struct ipq { uint8_t ipq_p; /* protocol of this fragment */ uint16_t ipq_id; /* sequence id for reassembly */ struct in_addr ipq_src,ipq_dst; -} QEMU_PACKED; +}; /* * Ip header, when holding a fragment. @@ -227,7 +227,10 @@ struct ipq { struct ipasfrag { struct qlink ipf_link; struct ip ipf_ip; -} QEMU_PACKED; +}; + +QEMU_BUILD_BUG_ON(offsetof(struct ipq, frag_link) != + offsetof(struct ipasfrag, ipf_link)); #define ipf_off ipf_ip.ip_off #define ipf_tos ipf_ip.ip_tos