From nobody Thu May 8 17:47:16 2025
Delivered-To: importer@patchew.org
Authentication-Results: mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass(p=none dis=none) header.from=linaro.org
ARC-Seal: i=1; a=rsa-sha256; t=1603802100; cv=none;
d=zohomail.com; s=zohoarc;
b=n2J3p6E9q77cPqc3ax1D+qIhMaGpSWs/uOeEkylFqd3jr4kDdDrodF3zRP6dNYBNwr9BZemN0UhATD1qhgMjaFsaqGudrxk7KNhKWtmqlIJZTM55LTEKvCNZZ/PD63Rx8FgyzJBRbrsgCl55pqMsRYbW47N7gBLgDJ3LftsxDGg=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1603802100;
h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To;
bh=NM27XSm9J67Z4qQZzb0OHzzztPe88IRprbDMsKz6TuQ=;
b=j61WWGtrWJQcpAmmL2EFqgQbO4kdBdBlXBoOVhAYT+v2lSqbEvNVBsIP5SxCFKbOEhCD9lUwbMVvXuVlAeitOUAsu25kShIX6/HXgE0pshQEjCNVm4e1PTLosCAEDv8Vfyo+Mtjm94doSHHJVizTp7gHUTAps2eBAaIURjnpCNw=
ARC-Authentication-Results: i=1; mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass header.from=<peter.maydell@linaro.org> (p=none dis=none)
header.from=<peter.maydell@linaro.org>
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1603802100473745.0895699122967;
Tue, 27 Oct 2020 05:35:00 -0700 (PDT)
Received: from localhost ([::1]:39812 helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces+importer=patchew.org@nongnu.org>)
id 1kXOBn-0006G6-A2
for importer@patchew.org; Tue, 27 Oct 2020 08:34:59 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:51596)
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <peter.maydell@linaro.org>)
id 1kXNPP-0001FL-P0
for qemu-devel@nongnu.org; Tue, 27 Oct 2020 07:44:59 -0400
Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:39388)
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <peter.maydell@linaro.org>)
id 1kXNPM-0004SB-3K
for qemu-devel@nongnu.org; Tue, 27 Oct 2020 07:44:59 -0400
Received: by mail-wr1-x42c.google.com with SMTP id y12so1522608wrp.6
for <qemu-devel@nongnu.org>; Tue, 27 Oct 2020 04:44:55 -0700 (PDT)
Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148])
by smtp.gmail.com with ESMTPSA id 32sm1712203wro.31.2020.10.27.04.44.53
for <qemu-devel@nongnu.org>
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Tue, 27 Oct 2020 04:44:53 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google;
h=from:to:subject:date:message-id:in-reply-to:references:mime-version
:content-transfer-encoding;
bh=NM27XSm9J67Z4qQZzb0OHzzztPe88IRprbDMsKz6TuQ=;
b=r86wwIxNfO9Din2C+f2yXqYS/Lrq/xueTNvWZ5UxqGPFZdSXlGl3uK+3/Dv/teb7XS
xHTEfz6s/JsvDlg3dxL586nUdGeIS0891eYXL0MvLUt04O44zUZce2CbxV4q2Cn3SZE3
Eeunda12iGqvy8KSKggnDYQcn2M83X0/B0ctBpXX+o6Ox4gy00OVPQx/4hewoXMHxe1+
rDBtLI4BZ5BKVm9he/BqAn6w39MOvG3YrJldn8gRbcBObNDEu+U91nI7W8J167papEBT
ueDG+CXAKqmYVWEap5n48yBlZIOqR9QhlZ1laLyErVo6bNJtqBhi3fMNu6/1CfaLO7nj
yshg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20161025;
h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to
:references:mime-version:content-transfer-encoding;
bh=NM27XSm9J67Z4qQZzb0OHzzztPe88IRprbDMsKz6TuQ=;
b=EjtBAM+7sKqa2JpyH/mSV46e+4Yy1xptW5ZKXRPwY8wtUKa3WWgINtK2QfV1Sdt0kG
by4emlLRy5IbAaxWRBJ5xei+Dt9YvU1s7ew9y6oVcxVLqNQDyjXKrZbEuUvQDQ9vba/b
uadvi4+laXlaY97lFggq8Al4sRwn32xjv+uRCyjsDoNO1MVl5KdJYWcSb1JfU+0ZxI09
Tdutzrk9pVmDRKrPHCWTmBn3eXbH5LY/oHtZu8rC3cFR2tnycT2ZDbeXWuAUqZ42iEI+
PR9Z0uo16Wx7krNV5zXdLLiRfW+IWNGairiQZCXIOjDYsZMWcl0QRqjcE+4HafsQuhkF
zUyQ==
X-Gm-Message-State: AOAM532tjxgWUvdBax7UhYR2uAx1ExUSfgO570TadBnIeTiod/5OMvjZ
/AAg1UPrpwRqM7Zzvl6s2T73KG5TruzRcw==
X-Google-Smtp-Source:
ABdhPJzfE1XBsyPgFazm5krXaPPQNwb1m9+dxl5L2vRhMm1d6b3NuMIPhWGctkldrGauwvhRjp9AaA==
X-Received: by 2002:a05:6000:ce:: with SMTP id
q14mr1269835wrx.113.1603799094040;
Tue, 27 Oct 2020 04:44:54 -0700 (PDT)
From: Peter Maydell <peter.maydell@linaro.org>
To: qemu-devel@nongnu.org
Subject: [PULL 10/48] linux-user/elfload: Parse NT_GNU_PROPERTY_TYPE_0 notes
Date: Tue, 27 Oct 2020 11:44:00 +0000
Message-Id: <20201027114438.17662-11-peter.maydell@linaro.org>
X-Mailer: git-send-email 2.20.1
In-Reply-To: <20201027114438.17662-1-peter.maydell@linaro.org>
References: <20201027114438.17662-1-peter.maydell@linaro.org>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17
as permitted sender) client-ip=209.51.188.17;
envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org;
helo=lists.gnu.org;
Received-SPF: pass client-ip=2a00:1450:4864:20::42c;
envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42c.google.com
X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache.
That's all we know.
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, DKIM_SIGNED=0.1,
DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
RCVD_IN_DNSWL_NONE=-0.0001, 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.23
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<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>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: "Qemu-devel" <qemu-devel-bounces+importer=patchew.org@nongnu.org>
X-ZohoMail-DKIM: pass (identity @linaro.org)
Content-Type: text/plain; charset="utf-8"
From: Richard Henderson <richard.henderson@linaro.org>
This is generic support, with the code disabled for all targets.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20201021173749.111103-11-richard.henderson@linaro.org
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
linux-user/qemu.h | 4 ++
linux-user/elfload.c | 157 +++++++++++++++++++++++++++++++++++++++++++
2 files changed, 161 insertions(+)
diff --git a/linux-user/qemu.h b/linux-user/qemu.h
index 941ca997228..534753ca125 100644
--- a/linux-user/qemu.h
+++ b/linux-user/qemu.h
@@ -61,6 +61,10 @@ struct image_info {
abi_ulong interpreter_loadmap_addr;
abi_ulong interpreter_pt_dynamic_addr;
struct image_info *other_info;
+
+ /* For target-specific processing of NT_GNU_PROPERTY_TYPE_0. */
+ uint32_t note_flags;
+
#ifdef TARGET_MIPS
int fp_abi;
int interp_fp_abi;
diff --git a/linux-user/elfload.c b/linux-user/elfload.c
index 04c04bc2602..428dcaa1528 100644
--- a/linux-user/elfload.c
+++ b/linux-user/elfload.c
@@ -1522,6 +1522,15 @@ static void elf_core_copy_regs(target_elf_gregset_t =
*regs,
=20
#include "elf.h"
=20
+static bool arch_parse_elf_property(uint32_t pr_type, uint32_t pr_datasz,
+ const uint32_t *data,
+ struct image_info *info,
+ Error **errp)
+{
+ g_assert_not_reached();
+}
+#define ARCH_USE_GNU_PROPERTY 0
+
struct exec
{
unsigned int a_info; /* Use macros N_MAGIC, etc for access */
@@ -2373,6 +2382,150 @@ void probe_guest_base(const char *image_name, abi_u=
long guest_loaddr,
"@ 0x%" PRIx64 "\n", (uint64_t)guest_base);
}
=20
+enum {
+ /* The string "GNU\0" as a magic number. */
+ GNU0_MAGIC =3D const_le32('G' | 'N' << 8 | 'U' << 16),
+ NOTE_DATA_SZ =3D 1 * KiB,
+ NOTE_NAME_SZ =3D 4,
+ ELF_GNU_PROPERTY_ALIGN =3D ELF_CLASS =3D=3D ELFCLASS32 ? 4 : 8,
+};
+
+/*
+ * Process a single gnu_property entry.
+ * Return false for error.
+ */
+static bool parse_elf_property(const uint32_t *data, int *off, int datasz,
+ struct image_info *info, bool have_prev_typ=
e,
+ uint32_t *prev_type, Error **errp)
+{
+ uint32_t pr_type, pr_datasz, step;
+
+ if (*off > datasz || !QEMU_IS_ALIGNED(*off, ELF_GNU_PROPERTY_ALIGN)) {
+ goto error_data;
+ }
+ datasz -=3D *off;
+ data +=3D *off / sizeof(uint32_t);
+
+ if (datasz < 2 * sizeof(uint32_t)) {
+ goto error_data;
+ }
+ pr_type =3D data[0];
+ pr_datasz =3D data[1];
+ data +=3D 2;
+ datasz -=3D 2 * sizeof(uint32_t);
+ step =3D ROUND_UP(pr_datasz, ELF_GNU_PROPERTY_ALIGN);
+ if (step > datasz) {
+ goto error_data;
+ }
+
+ /* Properties are supposed to be unique and sorted on pr_type. */
+ if (have_prev_type && pr_type <=3D *prev_type) {
+ if (pr_type =3D=3D *prev_type) {
+ error_setg(errp, "Duplicate property in PT_GNU_PROPERTY");
+ } else {
+ error_setg(errp, "Unsorted property in PT_GNU_PROPERTY");
+ }
+ return false;
+ }
+ *prev_type =3D pr_type;
+
+ if (!arch_parse_elf_property(pr_type, pr_datasz, data, info, errp)) {
+ return false;
+ }
+
+ *off +=3D 2 * sizeof(uint32_t) + step;
+ return true;
+
+ error_data:
+ error_setg(errp, "Ill-formed property in PT_GNU_PROPERTY");
+ return false;
+}
+
+/* Process NT_GNU_PROPERTY_TYPE_0. */
+static bool parse_elf_properties(int image_fd,
+ struct image_info *info,
+ const struct elf_phdr *phdr,
+ char bprm_buf[BPRM_BUF_SIZE],
+ Error **errp)
+{
+ union {
+ struct elf_note nhdr;
+ uint32_t data[NOTE_DATA_SZ / sizeof(uint32_t)];
+ } note;
+
+ int n, off, datasz;
+ bool have_prev_type;
+ uint32_t prev_type;
+
+ /* Unless the arch requires properties, ignore them. */
+ if (!ARCH_USE_GNU_PROPERTY) {
+ return true;
+ }
+
+ /* If the properties are crazy large, that's too bad. */
+ n =3D phdr->p_filesz;
+ if (n > sizeof(note)) {
+ error_setg(errp, "PT_GNU_PROPERTY too large");
+ return false;
+ }
+ if (n < sizeof(note.nhdr)) {
+ error_setg(errp, "PT_GNU_PROPERTY too small");
+ return false;
+ }
+
+ if (phdr->p_offset + n <=3D BPRM_BUF_SIZE) {
+ memcpy(¬e, bprm_buf + phdr->p_offset, n);
+ } else {
+ ssize_t len =3D pread(image_fd, ¬e, n, phdr->p_offset);
+ if (len !=3D n) {
+ error_setg_errno(errp, errno, "Error reading file header");
+ return false;
+ }
+ }
+
+ /*
+ * The contents of a valid PT_GNU_PROPERTY is a sequence
+ * of uint32_t -- swap them all now.
+ */
+#ifdef BSWAP_NEEDED
+ for (int i =3D 0; i < n / 4; i++) {
+ bswap32s(note.data + i);
+ }
+#endif
+
+ /*
+ * Note that nhdr is 3 words, and that the "name" described by namesz
+ * immediately follows nhdr and is thus at the 4th word. Further, all
+ * of the inputs to the kernel's round_up are multiples of 4.
+ */
+ if (note.nhdr.n_type !=3D NT_GNU_PROPERTY_TYPE_0 ||
+ note.nhdr.n_namesz !=3D NOTE_NAME_SZ ||
+ note.data[3] !=3D GNU0_MAGIC) {
+ error_setg(errp, "Invalid note in PT_GNU_PROPERTY");
+ return false;
+ }
+ off =3D sizeof(note.nhdr) + NOTE_NAME_SZ;
+
+ datasz =3D note.nhdr.n_descsz + off;
+ if (datasz > n) {
+ error_setg(errp, "Invalid note size in PT_GNU_PROPERTY");
+ return false;
+ }
+
+ have_prev_type =3D false;
+ prev_type =3D 0;
+ while (1) {
+ if (off =3D=3D datasz) {
+ return true; /* end, exit ok */
+ }
+ if (!parse_elf_property(note.data, &off, datasz, info,
+ have_prev_type, &prev_type, errp)) {
+ return false;
+ }
+ have_prev_type =3D true;
+ }
+}
+
/* Load an ELF image into the address space.
=20
IMAGE_NAME is the filename of the image, to use in error messages.
@@ -2467,6 +2620,10 @@ static void load_elf_image(const char *image_name, i=
nt image_fd,
goto exit_errmsg;
}
*pinterp_name =3D g_steal_pointer(&interp_name);
+ } else if (eppnt->p_type =3D=3D PT_GNU_PROPERTY) {
+ if (!parse_elf_properties(image_fd, info, eppnt, bprm_buf, &er=
r)) {
+ goto exit_errmsg;
+ }
}
}
=20
--=20
2.20.1