bpf.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Yonghong Song <yhs@fb.com>
To: Andrii Nakryiko <andrii@kernel.org>, <bpf@vger.kernel.org>,
	<netdev@vger.kernel.org>, <ast@fb.com>, <daniel@iogearbox.net>
Cc: <kernel-team@fb.com>
Subject: Re: [PATCH v2 bpf-next 07/17] libbpf: factor out symtab and relos sanity checks
Date: Thu, 22 Apr 2021 09:06:15 -0700	[thread overview]
Message-ID: <6fb105a3-ffc3-1970-8833-429e5b624e31@fb.com> (raw)
In-Reply-To: <20210416202404.3443623-8-andrii@kernel.org>



On 4/16/21 1:23 PM, Andrii Nakryiko wrote:
> Factor out logic for sanity checking SHT_SYMTAB and SHT_REL sections into
> separate sections. They are already quite extensive and are suffering from too
> deep indentation. Subsequent changes will extend SYMTAB sanity checking
> further, so it's better to factor each into a separate function.
> 
> No functional changes are intended.
> 
> Signed-off-by: Andrii Nakryiko <andrii@kernel.org>

Ack with a minor suggestion below.
Acked-by: Yonghong Song <yhs@fb.com>

> ---
>   tools/lib/bpf/linker.c | 233 ++++++++++++++++++++++-------------------
>   1 file changed, 127 insertions(+), 106 deletions(-)
> 
> diff --git a/tools/lib/bpf/linker.c b/tools/lib/bpf/linker.c
> index 4e08bc07e635..0bb927226370 100644
> --- a/tools/lib/bpf/linker.c
> +++ b/tools/lib/bpf/linker.c
> @@ -131,6 +131,8 @@ static int init_output_elf(struct bpf_linker *linker, const char *file);
>   
>   static int linker_load_obj_file(struct bpf_linker *linker, const char *filename, struct src_obj *obj);
>   static int linker_sanity_check_elf(struct src_obj *obj);
> +static int linker_sanity_check_elf_symtab(struct src_obj *obj, struct src_sec *sec);
> +static int linker_sanity_check_elf_relos(struct src_obj *obj, struct src_sec *sec);
>   static int linker_sanity_check_btf(struct src_obj *obj);
>   static int linker_sanity_check_btf_ext(struct src_obj *obj);
>   static int linker_fixup_btf(struct src_obj *obj);
> @@ -663,8 +665,8 @@ static bool is_pow_of_2(size_t x)
>   
>   static int linker_sanity_check_elf(struct src_obj *obj)
>   {
> -	struct src_sec *sec, *link_sec;
> -	int i, j, n;
> +	struct src_sec *sec;
> +	int i, err;
>   
>   	if (!obj->symtab_sec_idx) {
>   		pr_warn("ELF is missing SYMTAB section in %s\n", obj->filename);
> @@ -692,43 +694,11 @@ static int linker_sanity_check_elf(struct src_obj *obj)
>   			return -EINVAL;
>   
>   		switch (sec->shdr->sh_type) {
> -		case SHT_SYMTAB: {
> -			Elf64_Sym *sym;
> -
> -			if (sec->shdr->sh_entsize != sizeof(Elf64_Sym))
> -				return -EINVAL;
> -			if (sec->shdr->sh_size % sec->shdr->sh_entsize != 0)
> -				return -EINVAL;
> -
> -			if (!sec->shdr->sh_link || sec->shdr->sh_link >= obj->sec_cnt) {
> -				pr_warn("ELF SYMTAB section #%zu points to missing STRTAB section #%zu in %s\n",
> -					sec->sec_idx, (size_t)sec->shdr->sh_link, obj->filename);
> -				return -EINVAL;
> -			}
> -			link_sec = &obj->secs[sec->shdr->sh_link];
> -			if (link_sec->shdr->sh_type != SHT_STRTAB) {
> -				pr_warn("ELF SYMTAB section #%zu points to invalid STRTAB section #%zu in %s\n",
> -					sec->sec_idx, (size_t)sec->shdr->sh_link, obj->filename);
> -				return -EINVAL;
> -			}
> -
> -			n = sec->shdr->sh_size / sec->shdr->sh_entsize;
> -			sym = sec->data->d_buf;
> -			for (j = 0; j < n; j++, sym++) {
> -				if (sym->st_shndx
> -				    && sym->st_shndx < SHN_LORESERVE
> -				    && sym->st_shndx >= obj->sec_cnt) {
> -					pr_warn("ELF sym #%d in section #%zu points to missing section #%zu in %s\n",
> -						j, sec->sec_idx, (size_t)sym->st_shndx, obj->filename);
> -					return -EINVAL;
> -				}
> -				if (ELF64_ST_TYPE(sym->st_info) == STT_SECTION) {
> -					if (sym->st_value != 0)
> -						return -EINVAL;
> -				}
> -			}
> +		case SHT_SYMTAB:
> +			err = linker_sanity_check_elf_symtab(obj, sec);
> +			if (err)
> +				return err;
>   			break;
> -		}
>   		case SHT_STRTAB:
>   			break;
>   		case SHT_PROGBITS:
> @@ -739,87 +709,138 @@ static int linker_sanity_check_elf(struct src_obj *obj)
>   			break;
>   		case SHT_NOBITS:
>   			break;
> -		case SHT_REL: {
> -			Elf64_Rel *relo;
> -			struct src_sec *sym_sec;
> +		case SHT_REL:
> +			err = linker_sanity_check_elf_relos(obj, sec);
> +			if (err)
> +				return err;
> +			break;
> +		case SHT_LLVM_ADDRSIG:
> +			break;
> +		default:
> +			pr_warn("ELF section #%zu (%s) has unrecognized type %zu in %s\n",
> +				sec->sec_idx, sec->sec_name, (size_t)sec->shdr->sh_type, obj->filename);
> +			return -EINVAL;
> +		}
> +	}
>   
> -			if (sec->shdr->sh_entsize != sizeof(Elf64_Rel))
> -				return -EINVAL;
> -			if (sec->shdr->sh_size % sec->shdr->sh_entsize != 0)
> -				return -EINVAL;
> +	return 0;
> +}
>   
> -			/* SHT_REL's sh_link should point to SYMTAB */
> -			if (sec->shdr->sh_link != obj->symtab_sec_idx) {
> -				pr_warn("ELF relo section #%zu points to invalid SYMTAB section #%zu in %s\n",
> -					sec->sec_idx, (size_t)sec->shdr->sh_link, obj->filename);
> -				return -EINVAL;
> -			}
> +static int linker_sanity_check_elf_symtab(struct src_obj *obj, struct src_sec *sec)
> +{
> +	struct src_sec *link_sec;
> +	Elf64_Sym *sym;
> +	int i, n;
>   
> -			/* SHT_REL's sh_info points to relocated section */
> -			if (!sec->shdr->sh_info || sec->shdr->sh_info >= obj->sec_cnt) {
> -				pr_warn("ELF relo section #%zu points to missing section #%zu in %s\n",
> -					sec->sec_idx, (size_t)sec->shdr->sh_info, obj->filename);
> -				return -EINVAL;
> -			}
> -			link_sec = &obj->secs[sec->shdr->sh_info];
> +	if (sec->shdr->sh_entsize != sizeof(Elf64_Sym))
> +		return -EINVAL;
> +	if (sec->shdr->sh_size % sec->shdr->sh_entsize != 0)
> +		return -EINVAL;
> +
> +	if (!sec->shdr->sh_link || sec->shdr->sh_link >= obj->sec_cnt) {
> +		pr_warn("ELF SYMTAB section #%zu points to missing STRTAB section #%zu in %s\n",
> +			sec->sec_idx, (size_t)sec->shdr->sh_link, obj->filename);
> +		return -EINVAL;
> +	}
> +	link_sec = &obj->secs[sec->shdr->sh_link];
> +	if (link_sec->shdr->sh_type != SHT_STRTAB) {
> +		pr_warn("ELF SYMTAB section #%zu points to invalid STRTAB section #%zu in %s\n",
> +			sec->sec_idx, (size_t)sec->shdr->sh_link, obj->filename);
> +		return -EINVAL;
> +	}
>   
> -			/* .rel<secname> -> <secname> pattern is followed */
> -			if (strncmp(sec->sec_name, ".rel", sizeof(".rel") - 1) != 0
> -			    || strcmp(sec->sec_name + sizeof(".rel") - 1, link_sec->sec_name) != 0) {
> -				pr_warn("ELF relo section #%zu name has invalid name in %s\n",
> -					sec->sec_idx, obj->filename);
> +	n = sec->shdr->sh_size / sec->shdr->sh_entsize;
> +	sym = sec->data->d_buf;
> +	for (i = 0; i < n; i++, sym++) {
> +		if (sym->st_shndx
> +		    && sym->st_shndx < SHN_LORESERVE
> +		    && sym->st_shndx >= obj->sec_cnt) {
> +			pr_warn("ELF sym #%d in section #%zu points to missing section #%zu in %s\n",
> +				i, sec->sec_idx, (size_t)sym->st_shndx, obj->filename);
> +			return -EINVAL;
> +		}
> +		if (ELF64_ST_TYPE(sym->st_info) == STT_SECTION) {
> +			if (sym->st_value != 0)
>   				return -EINVAL;
> -			}
> +			continue;

I think this "continue" is not necessary.

> +		}
> +	}
>   
> -			/* don't further validate relocations for ignored sections */
> -			if (link_sec->skipped)
> -				break;
> +	return 0;
> +}
>   
> -			/* relocatable section is data or instructions */
> -			if (link_sec->shdr->sh_type != SHT_PROGBITS
> -			    && link_sec->shdr->sh_type != SHT_NOBITS) {
> -				pr_warn("ELF relo section #%zu points to invalid section #%zu in %s\n",
> -					sec->sec_idx, (size_t)sec->shdr->sh_info, obj->filename);
> -				return -EINVAL;
> -			}
[...]

  reply	other threads:[~2021-04-22 16:06 UTC|newest]

Thread overview: 67+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-16 20:23 [PATCH v2 bpf-next 00/17] BPF static linker: support externs Andrii Nakryiko
2021-04-16 20:23 ` [PATCH v2 bpf-next 01/17] bpftool: support dumping BTF VAR's "extern" linkage Andrii Nakryiko
2021-04-22  3:02   ` Yonghong Song
2021-04-16 20:23 ` [PATCH v2 bpf-next 02/17] bpftool: dump more info about DATASEC members Andrii Nakryiko
2021-04-22  3:09   ` Yonghong Song
2021-04-16 20:23 ` [PATCH v2 bpf-next 03/17] libbpf: suppress compiler warning when using SEC() macro with externs Andrii Nakryiko
2021-04-22  3:47   ` Yonghong Song
2021-04-22  3:59     ` Andrii Nakryiko
2021-04-16 20:23 ` [PATCH v2 bpf-next 04/17] libbpf: mark BPF subprogs with hidden visibility as static for BPF verifier Andrii Nakryiko
2021-04-22  5:43   ` Yonghong Song
2021-04-22 18:09     ` Andrii Nakryiko
2021-04-22 23:00       ` Yonghong Song
2021-04-22 23:28         ` Andrii Nakryiko
2021-04-16 20:23 ` [PATCH v2 bpf-next 05/17] libbpf: allow gaps in BPF program sections to support overriden weak functions Andrii Nakryiko
2021-04-22  6:25   ` Yonghong Song
2021-04-22 18:10     ` Andrii Nakryiko
2021-04-16 20:23 ` [PATCH v2 bpf-next 06/17] libbpf: refactor BTF map definition parsing Andrii Nakryiko
2021-04-22 15:33   ` Yonghong Song
2021-04-22 18:40     ` Andrii Nakryiko
2021-04-16 20:23 ` [PATCH v2 bpf-next 07/17] libbpf: factor out symtab and relos sanity checks Andrii Nakryiko
2021-04-22 16:06   ` Yonghong Song [this message]
2021-04-22 18:16     ` Andrii Nakryiko
2021-04-16 20:23 ` [PATCH v2 bpf-next 08/17] libbpf: make few internal helpers available outside of libbpf.c Andrii Nakryiko
2021-04-22 16:19   ` Yonghong Song
2021-04-22 18:18     ` Andrii Nakryiko
2021-04-16 20:23 ` [PATCH v2 bpf-next 09/17] libbpf: extend sanity checking ELF symbols with externs validation Andrii Nakryiko
2021-04-22 16:35   ` Yonghong Song
2021-04-22 18:20     ` Andrii Nakryiko
2021-04-22 23:13       ` Yonghong Song
2021-04-16 20:23 ` [PATCH v2 bpf-next 10/17] libbpf: tighten BTF type ID rewriting with error checking Andrii Nakryiko
2021-04-22 16:50   ` Yonghong Song
2021-04-22 18:24     ` Andrii Nakryiko
2021-04-23  2:54       ` Alexei Starovoitov
2021-04-23  4:25         ` Andrii Nakryiko
2021-04-23  5:11           ` Alexei Starovoitov
2021-04-23 16:09             ` Andrii Nakryiko
2021-04-23 16:18               ` Alexei Starovoitov
2021-04-23 16:30                 ` Andrii Nakryiko
2021-04-23 16:34                   ` Alexei Starovoitov
2021-04-23 17:02                     ` Andrii Nakryiko
2021-04-16 20:23 ` [PATCH v2 bpf-next 11/17] libbpf: add linker extern resolution support for functions and global variables Andrii Nakryiko
2021-04-22 21:27   ` Yonghong Song
2021-04-22 22:12     ` Andrii Nakryiko
2021-04-22 23:57       ` Yonghong Song
2021-04-23  2:36         ` Yonghong Song
2021-04-23  4:28           ` Andrii Nakryiko
2021-04-23  4:27         ` Andrii Nakryiko
2021-04-16 20:23 ` [PATCH v2 bpf-next 12/17] libbpf: support extern resolution for BTF-defined maps in .maps section Andrii Nakryiko
2021-04-22 22:56   ` Yonghong Song
2021-04-22 23:32     ` Andrii Nakryiko
2021-04-16 20:24 ` [PATCH v2 bpf-next 13/17] selftests/bpf: use -O0 instead of -Og in selftests builds Andrii Nakryiko
2021-04-23  0:05   ` Yonghong Song
2021-04-16 20:24 ` [PATCH v2 bpf-next 14/17] selftests/bpf: omit skeleton generation for multi-linked BPF object files Andrii Nakryiko
2021-04-23  0:13   ` Yonghong Song
2021-04-16 20:24 ` [PATCH v2 bpf-next 15/17] selftests/bpf: add function linking selftest Andrii Nakryiko
2021-04-23  0:50   ` Yonghong Song
2021-04-23  2:34     ` Alexei Starovoitov
2021-04-23  4:29       ` Andrii Nakryiko
2021-04-23 17:18     ` Andrii Nakryiko
2021-04-23 17:35       ` Yonghong Song
2021-04-23 17:55         ` Andrii Nakryiko
2021-04-23 17:58           ` Yonghong Song
2021-04-23 17:59             ` Andrii Nakryiko
2021-04-16 20:24 ` [PATCH v2 bpf-next 16/17] selftests/bpf: add global variables " Andrii Nakryiko
2021-04-23  1:01   ` Yonghong Song
2021-04-16 20:24 ` [PATCH v2 bpf-next 17/17] sleftests/bpf: add map " Andrii Nakryiko
2021-04-23  1:20   ` Yonghong Song

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=6fb105a3-ffc3-1970-8833-429e5b624e31@fb.com \
    --to=yhs@fb.com \
    --cc=andrii@kernel.org \
    --cc=ast@fb.com \
    --cc=bpf@vger.kernel.org \
    --cc=daniel@iogearbox.net \
    --cc=kernel-team@fb.com \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).