From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1ZIjNj-0003CT-KO for mharc-grub-devel@gnu.org; Fri, 24 Jul 2015 16:15:47 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34211) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZIjNg-00038a-IB for grub-devel@gnu.org; Fri, 24 Jul 2015 16:15:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZIjNb-0000lq-Be for grub-devel@gnu.org; Fri, 24 Jul 2015 16:15:44 -0400 Received: from mail-lb0-x232.google.com ([2a00:1450:4010:c04::232]:36685) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZIjNa-0000kb-MD for grub-devel@gnu.org; Fri, 24 Jul 2015 16:15:39 -0400 Received: by lbbqi7 with SMTP id qi7so21793178lbb.3 for ; Fri, 24 Jul 2015 13:15:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:cc:subject:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=HMEa5c8OdSJ3FxwuuYa6ardv7wXjDaU4AGZlhSayqTE=; b=kvopKNTszu2bDBh3So2EJXLMYBkmDSAl1Os3641SgrbvlgoxnEEVuvvogtwnH99Qgz 8FPnxzW8wje7p3WOAlsoKynXjwualmu3ThkS53LArRYFFnIj4+2EI9Zplk/qpbGb6k3j ctTVigNWVqOBB31tFO9RmRAW9RL9X5remr+YqhRmP131GrqSN7fl8ubAaOecLumTqQ2H TmGbMY5KESAy7xd1k14q0+oHQVsmdIBFnlaa+9cHSt253CTc+mQPppOQhcTmeE4ezHdJ B/dhusQX2bPQ/Tsi9zpispLwMnwBg1X/bRDIH0TxdBF85aCo6KJxhxw3xoUN4zWd7OHl m8aw== X-Received: by 10.152.21.71 with SMTP id t7mr9747568lae.118.1437768937846; Fri, 24 Jul 2015 13:15:37 -0700 (PDT) Received: from opensuse.site (ppp91-76-6-204.pppoe.mtu-net.ru. [91.76.6.204]) by smtp.gmail.com with ESMTPSA id r4sm2017208lag.46.2015.07.24.13.15.37 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 24 Jul 2015 13:15:37 -0700 (PDT) Date: Fri, 24 Jul 2015 23:15:36 +0300 From: Andrei Borzenkov To: "Vladimir 'phcoder' Serbinenko" Subject: Re: [PATCH v2] Suport for bi-endianess in elf file Message-ID: <20150724231536.7a78e98e@opensuse.site> In-Reply-To: References: <1437660636-4027-1-git-send-email-pfsmorigo@linux.vnet.ibm.com> X-Mailer: Claws Mail 3.11.0 (GTK+ 2.24.28; x86_64-suse-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4010:c04::232 Cc: The development of GRUB 2 , Paulo Flabiano Smorigo X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Jul 2015 20:15:46 -0000 =D0=92 Fri, 24 Jul 2015 21:00:50 +0200 "Vladimir 'phcoder' Serbinenko" =D0=BF=D0=B8=D1=88=D0= =B5=D1=82: > Le 23 juil. 2015 16:11, "Paulo Flabiano Smorigo" < > pfsmorigo@linux.vnet.ibm.com> a =C3=A9crit : > > > > Updated version with the suggestions from Andrei Borzenkov. > > > > * grub-core/kern/elf.c: check and switch endianess with grub_{be,le}_to > > cpu functions. > > * grub-core/kern/elfXX.c: Likewise. > > > > Also-by: Tomohiro B Berry > > --- > > grub-core/kern/elf.c | 51 ++++++++++++++++++++++++++++++--- > > grub-core/kern/elfXX.c | 76 > ++++++++++++++++++++++++++++++++++++++++++++++++++ > > 2 files changed, 123 insertions(+), 4 deletions(-) > > > > diff --git a/grub-core/kern/elf.c b/grub-core/kern/elf.c > > index 5f99c43..1be9c1c 100644 > > --- a/grub-core/kern/elf.c > > +++ b/grub-core/kern/elf.c > > @@ -28,6 +28,11 @@ > > > > GRUB_MOD_LICENSE ("GPLv3+"); > > > > +#if defined(__powerpc__) && defined(GRUB_MACHINE_IEEE1275) > > +void grub_elf32_check_endianess (grub_elf_t elf); > > +void grub_elf64_check_endianess (grub_elf_t elf); > > +#endif /* defined(__powerpc__) && defined(GRUB_MACHINE_IEEE1275) */ > > + > > /* Check if EHDR is a valid ELF header. */ > > static grub_err_t > > grub_elf_check_header (grub_elf_t elf) > > @@ -38,8 +43,19 @@ grub_elf_check_header (grub_elf_t elf) > > || e->e_ident[EI_MAG1] !=3D ELFMAG1 > > || e->e_ident[EI_MAG2] !=3D ELFMAG2 > > || e->e_ident[EI_MAG3] !=3D ELFMAG3 > > - || e->e_ident[EI_VERSION] !=3D EV_CURRENT > > - || e->e_version !=3D EV_CURRENT) > > + || e->e_ident[EI_VERSION] !=3D EV_CURRENT) > > + return grub_error (GRUB_ERR_BAD_OS, N_("invalid arch-independent E= LF > magic")); > > + > > +#if defined(__powerpc__) && defined(GRUB_MACHINE_IEEE1275) > > + if (grub_elf_is_elf32 (elf)) > > + grub_elf32_check_endianess (elf); > > + else if (grub_elf_is_elf64 (elf)) > > + grub_elf64_check_endianess (elf); > > + else > > + return grub_error (GRUB_ERR_BAD_OS, N_("Uknown ELF class")); > > +#endif /* defined(__powerpc__) && defined(GRUB_MACHINE_IEEE1275) */ > > + > > + if (e->e_version !=3D EV_CURRENT) > > return grub_error (GRUB_ERR_BAD_OS, N_("invalid arch-independent E= LF > magic")); > > > > return GRUB_ERR_NONE; > > @@ -116,7 +132,11 @@ grub_elf_open (const char *name) > > return elf; > > } > > > > - > > +#define grub_be_to_halfXX grub_be_to_cpu16 > > +#define grub_le_to_halfXX grub_le_to_cpu16 > > +#define grub_be_to_wordXX grub_be_to_cpu32 > > +#define grub_le_to_wordXX grub_le_to_cpu32 > > + > > /* 32-bit */ > > #define ehdrXX ehdr32 > > #define ELFCLASSXX ELFCLASS32 > > @@ -127,7 +147,15 @@ grub_elf_open (const char *name) > > #define grub_elf_is_elfXX grub_elf_is_elf32 > > #define grub_elfXX_load_phdrs grub_elf32_load_phdrs > > #define ElfXX_Phdr Elf32_Phdr > > +#define ElfXX_Ehdr Elf32_Ehdr > > #define grub_uintXX_t grub_uint32_t > > +#define grub_be_to_addrXX grub_be_to_cpu32 > > +#define grub_le_to_addrXX grub_le_to_cpu32 > > +#define grub_be_to_offXX grub_be_to_cpu32 > > +#define grub_le_to_offXX grub_le_to_cpu32 > > +#define grub_be_to_XwordXX grub_be_to_cpu32 > > +#define grub_le_to_XwordXX grub_le_to_cpu32 > > +#define grub_elfXX_check_endianess grub_elf32_check_endianess > > > > #include "elfXX.c" > > > > @@ -140,9 +168,16 @@ grub_elf_open (const char *name) > > #undef grub_elf_is_elfXX > > #undef grub_elfXX_load_phdrs > > #undef ElfXX_Phdr > > +#undef ElfXX_Ehdr > > #undef grub_uintXX_t > > +#undef grub_be_to_addrXX > > +#undef grub_le_to_addrXX > > +#undef grub_be_to_offXX > > +#undef grub_le_to_offXX > > +#undef grub_be_to_XwordXX > > +#undef grub_le_to_XwordXX > > +#undef grub_elfXX_check_endianess > > > > - > > /* 64-bit */ > > #define ehdrXX ehdr64 > > #define ELFCLASSXX ELFCLASS64 > > @@ -153,6 +188,14 @@ grub_elf_open (const char *name) > > #define grub_elf_is_elfXX grub_elf_is_elf64 > > #define grub_elfXX_load_phdrs grub_elf64_load_phdrs > > #define ElfXX_Phdr Elf64_Phdr > > +#define ElfXX_Ehdr Elf64_Ehdr > > #define grub_uintXX_t grub_uint64_t > > +#define grub_be_to_addrXX grub_be_to_cpu64 > > +#define grub_le_to_addrXX grub_le_to_cpu64 > > +#define grub_be_to_offXX grub_be_to_cpu64 > > +#define grub_le_to_offXX grub_le_to_cpu64 > > +#define grub_be_to_XwordXX grub_be_to_cpu64 > > +#define grub_le_to_XwordXX grub_le_to_cpu64 > > +#define grub_elfXX_check_endianess grub_elf64_check_endianess > > > > #include "elfXX.c" > > diff --git a/grub-core/kern/elfXX.c b/grub-core/kern/elfXX.c > > index 1d09971..c14e071 100644 > > --- a/grub-core/kern/elfXX.c > > +++ b/grub-core/kern/elfXX.c > > @@ -31,6 +31,39 @@ grub_elfXX_load_phdrs (grub_elf_t elf) > > return grub_errno; > > } > > > > +#if defined(__powerpc__) && defined(GRUB_MACHINE_IEEE1275) > > + ElfXX_Phdr *phdr; > > + for (phdr =3D elf->phdrs; > > + phdr && phdr < (ElfXX_Phdr *) elf->phdrs + > elf->ehdr.ehdrXX.e_phnum; > > + phdr++) > > + { > > + if (elf->ehdr.ehdrXX.e_ident[EI_DATA] =3D=3D ELFDATA2LSB) > > + { > > + phdr->p_type =3D grub_le_to_wordXX (phdr->p_type); > > + phdr->p_flags =3D grub_le_to_wordXX (phdr->p_flags); > > + phdr->p_offset =3D grub_le_to_offXX (phdr->p_offset); > > + phdr->p_vaddr =3D grub_le_to_addrXX (phdr->p_vaddr); > > + phdr->p_paddr =3D grub_le_to_addrXX (phdr->p_paddr); > > + phdr->p_filesz =3D grub_le_to_XwordXX (phdr->p_filesz); > > + phdr->p_memsz =3D grub_le_to_XwordXX (phdr->p_memsz); > > + phdr->p_align =3D grub_le_to_XwordXX (phdr->p_align); > > + } > > +#if !defined(GRUB_CPU_WORDS_BIGENDIAN) && 0 > &&0. Really. AFAICT this breaks bigendian elf support. Please test your > patch with be kernel It boots BE ppc64 kernel up to "init not found" :)