Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 12ef5634 authored by Andrii Nakryiko's avatar Andrii Nakryiko Committed by Daniel Borkmann
Browse files

libbpf: simplify endianness check 



Rewrite endianness check to use "more canonical" way, using
compiler-defined macros, similar to few other places in libbpf. It also
is more obvious and shorter.

Acked-by: default avatarSong Liu <songliubraving@fb.com>
Signed-off-by: default avatarAndrii Nakryiko <andriin@fb.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
parent be5c5d4e

tools/lib/bpf/libbpf.c

+12 −25
Original line number Diff line number Diff line
@@ -607,31 +607,18 @@ static int bpf_object__elf_init(struct bpf_object *obj) 
	return err;

}



static int

bpf_object__check_endianness(struct bpf_object *obj)

static int bpf_object__check_endianness(struct bpf_object *obj)

{

	static unsigned int const endian = 1;



	switch (obj->efile.ehdr.e_ident[EI_DATA]) {

	case ELFDATA2LSB:

		/* We are big endian, BPF obj is little endian. */

		if (*(unsigned char const *)&endian != 1)

			goto mismatch;

		break;



	case ELFDATA2MSB:

		/* We are little endian, BPF obj is big endian. */

		if (*(unsigned char const *)&endian != 0)

			goto mismatch;

		break;

	default:

		return -LIBBPF_ERRNO__ENDIAN;

	}



#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__

	if (obj->efile.ehdr.e_ident[EI_DATA] == ELFDATA2LSB)

		return 0;



mismatch:

	pr_warning("Error: endianness mismatch.\n");

#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__

	if (obj->efile.ehdr.e_ident[EI_DATA] == ELFDATA2MSB)

		return 0;

#else

# error "Unrecognized __BYTE_ORDER__"

#endif

	pr_warning("endianness mismatch.\n");

	return -LIBBPF_ERRNO__ENDIAN;

}