From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1Zqp6G-0007L2-Hf for mharc-grub-devel@gnu.org; Mon, 26 Oct 2015 17:14:40 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33859) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zqp6C-0007Kn-Qf for grub-devel@gnu.org; Mon, 26 Oct 2015 17:14:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zqp6B-0000cZ-Ad for grub-devel@gnu.org; Mon, 26 Oct 2015 17:14:36 -0400 Received: from mail-wi0-x236.google.com ([2a00:1450:400c:c05::236]:34142) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zqp6B-0000cO-1r for grub-devel@gnu.org; Mon, 26 Oct 2015 17:14:35 -0400 Received: by wikq8 with SMTP id q8so183662824wik.1 for ; Mon, 26 Oct 2015 14:14:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=subject:to:references:from:message-id:date:user-agent:mime-version :in-reply-to:content-type; bh=7Er3wKClV55W7xNfQ+jQ8LvgPyy7QP9N81tjeC1zTNk=; b=R4sb/1YTyA5lGeC9Oz+eEln21t2qrrFlX85DScMVjnenpVP6fRcfVGYQo0ACRUC3YP Hv06ZPoK7r5/L0k812natMY/BgmD06vyU588DKM2UH785uur3ip6TEUZ3syuKNvGT3HV EGjpZTg7Ps7f1DF1Lc0ZC8sQe1fJm0+zO3mD1LkwWbnmuyu2+aoKHVI241xYVybm4uCv fFGugD78as3DXcn/Ci+5x7A1C+8ytAZHcLlGvk4jQpdy//+gFk2VDb4jKg+7CbnkZUcN HfmZrWEmCZDohpO2v+KQut6mHTXQJseySWO2C+W8Zvo07GMlw6S9yu4NQcnV8TVLY2LM gSUg== X-Received: by 10.28.94.129 with SMTP id s123mr2394327wmb.78.1445894074111; Mon, 26 Oct 2015 14:14:34 -0700 (PDT) Received: from ?IPv6:2a02:1205:34c8:dc00:863a:4bff:fe50:abc4? ([2a02:1205:34c8:dc00:863a:4bff:fe50:abc4]) by smtp.gmail.com with ESMTPSA id h8sm15301567wib.8.2015.10.26.14.14.32 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 26 Oct 2015 14:14:32 -0700 (PDT) Subject: Re: [PATCH v2] Suport for bi-endianess in elf file To: The development of GNU GRUB References: <1437660636-4027-1-git-send-email-pfsmorigo@linux.vnet.ibm.com> From: =?UTF-8?Q?Vladimir_'=cf=86-coder/phcoder'_Serbinenko?= Message-ID: <562E9798.40402@gmail.com> Date: Mon, 26 Oct 2015 22:14:00 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Icedove/38.2.0 MIME-Version: 1.0 In-Reply-To: <1437660636-4027-1-git-send-email-pfsmorigo@linux.vnet.ibm.com> Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="EB3Uurx66pAqH3oRpRjsrWwXRFP9tXh4d" X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c05::236 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: Mon, 26 Oct 2015 21:14:38 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --EB3Uurx66pAqH3oRpRjsrWwXRFP9tXh4d Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 23.07.2015 16:10, Paulo Flabiano Smorigo wrote: > Updated version with the suggestions from Andrei Borzenkov. >=20 > * grub-core/kern/elf.c: check and switch endianess with grub_{be,le}_to= > cpu functions. > * grub-core/kern/elfXX.c: Likewise. Applied after fixing following problems: * Since you already use WORDS_BIGENDIAN you might as well use swap_bytes and get some benefits of it like smaller code (we usually prefer le_to_cpu but their point is exactly to avoid to check for WORDS_BIGENDIA= N) * phdr iterator assumed that phentsize =3D=3D sizeof (*ElfXX_Phdr). * __powerpc__ && IEEE1275 condition was repeated way too often. Encapsulated. * Confusing function names * file-local functions non-static * Missing error check >=20 > Also-by: Tomohiro B Berry > --- > grub-core/kern/elf.c | 51 ++++++++++++++++++++++++++++++--- > grub-core/kern/elfXX.c | 76 ++++++++++++++++++++++++++++++++++++++++++= ++++++++ > 2 files changed, 123 insertions(+), 4 deletions(-) >=20 > 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 @@ > =20 > GRUB_MOD_LICENSE ("GPLv3+"); > =20 > +#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")); > =20 > return GRUB_ERR_NONE; > @@ -116,7 +132,11 @@ grub_elf_open (const char *name) > return elf; > } > =20 > -=0C > +#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 > =20 > #include "elfXX.c" > =20 > @@ -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 > =20 > -=0C > /* 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 > =20 > #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; > } > =20 > +#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_p= hnum; > + 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 > + else if (elf->ehdr.ehdrXX.e_ident[EI_DATA] =3D=3D ELFDATA2MSB) > + { > + phdr->p_type =3D grub_be_to_wordXX (phdr->p_type); > + phdr->p_flags =3D grub_be_to_wordXX (phdr->p_flags); > + phdr->p_offset =3D grub_be_to_offXX (phdr->p_offset); > + phdr->p_vaddr =3D grub_be_to_addrXX (phdr->p_vaddr); > + phdr->p_paddr =3D grub_be_to_addrXX (phdr->p_paddr); > + phdr->p_filesz =3D grub_be_to_XwordXX (phdr->p_filesz); > + phdr->p_memsz =3D grub_be_to_XwordXX (phdr->p_memsz); > + phdr->p_align =3D grub_be_to_XwordXX (phdr->p_align); > + } > +#endif /* !defined(GRUB_CPU_WORDS_BIGENDIAN) && 0 */ > + } > +#endif /* defined(__powerpc__) && defined(GRUB_MACHINE_IEEE1275) */ > + > return GRUB_ERR_NONE; > } > =20 > @@ -154,3 +187,46 @@ grub_elfXX_load (grub_elf_t elf, const char *filen= ame, > =20 > return grub_errno; > } > + > +#if defined(__powerpc__) && defined(GRUB_MACHINE_IEEE1275) > +void > +grub_elfXX_check_endianess (grub_elf_t elf) > +{ > + ElfXX_Ehdr *e =3D &(elf->ehdr.ehdrXX); > + > + if (e->e_ident[EI_DATA] =3D=3D ELFDATA2LSB) > + { > + e->e_type =3D grub_le_to_halfXX (e->e_type); > + e->e_machine =3D grub_le_to_halfXX (e->e_machine); > + e->e_version =3D grub_le_to_wordXX (e->e_version); > + e->e_entry =3D grub_le_to_addrXX (e->e_entry); > + e->e_phoff =3D grub_le_to_offXX (e->e_phoff); > + e->e_shoff =3D grub_le_to_offXX (e->e_shoff); > + e->e_flags =3D grub_le_to_wordXX (e->e_flags); > + e->e_ehsize =3D grub_le_to_halfXX (e->e_ehsize); > + e->e_phentsize =3D grub_le_to_halfXX (e->e_phentsize); > + e->e_phnum =3D grub_le_to_halfXX (e->e_phnum); > + e->e_shentsize =3D grub_le_to_halfXX (e->e_shentsize); > + e->e_shnum =3D grub_le_to_halfXX (e->e_shnum); > + e->e_shstrndx =3D grub_le_to_halfXX (e->e_shstrndx); > + } > +#if !defined(GRUB_CPU_WORDS_BIGENDIAN) && 0 > + else if (e->e_ident[EI_DATA] =3D=3D ELFDATA2MSB) > + { > + e->e_type =3D grub_be_to_halfXX (e->e_type); > + e->e_machine =3D grub_be_to_halfXX (e->e_machine); > + e->e_version =3D grub_be_to_wordXX (e->e_version); > + e->e_entry =3D grub_be_to_addrXX (e->e_entry); > + e->e_phoff =3D grub_be_to_offXX (e->e_phoff); > + e->e_shoff =3D grub_be_to_offXX (e->e_shoff); > + e->e_flags =3D grub_be_to_wordXX (e->e_flags); > + e->e_ehsize =3D grub_be_to_halfXX (e->e_ehsize); > + e->e_phentsize =3D grub_be_to_halfXX (e->e_phentsize); > + e->e_phnum =3D grub_be_to_halfXX (e->e_phnum); > + e->e_shentsize =3D grub_be_to_halfXX (e->e_shentsize); > + e->e_shnum =3D grub_be_to_halfXX (e->e_shnum); > + e->e_shstrndx =3D grub_be_to_halfXX (e->e_shstrndx); > + } > +#endif /* !defined(GRUB_CPU_WORDS_BIGENDIAN) && 0 */ > +} > +#endif /* defined(__powerpc__) && defined(GRUB_MACHINE_IEEE1275) */ >=20 --EB3Uurx66pAqH3oRpRjsrWwXRFP9tXh4d Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iF4EAREKAAYFAlYul7gACgkQmBXlbbo5nOsKaAD/eDVzmcflQQKAznY990Gu1YK/ UNNbfkbNRxuKpr28gQABAJgMVJ89eKIcvS4T12GDrWW+deP/9Z+jyLNPXTEaVpUT =EEng -----END PGP SIGNATURE----- --EB3Uurx66pAqH3oRpRjsrWwXRFP9tXh4d--