public inbox for binutils@sourceware.org
 help / color / mirror / Atom feed
From: liuzhensong <liuzhensong@loongson.cn>
To: Xi Ruoyao <xry111@xry111.site>, binutils@sourceware.org
Cc: Chenghua Xu <xuchenghua@loongson.cn>,
	Lulu Cheng <chenglulu@loongson.cn>, Wang Xuerui <i@xen0n.name>
Subject: Re: [PATCH 1/2] LoongArch: Avoid heap-buffer-overflow in loongarch_elf_relocate_section
Date: Thu, 15 Sep 2022 09:47:48 +0800	[thread overview]
Message-ID: <6f3d0d05-c7a2-b4cf-2a3c-abb1f343ff86@loongson.cn> (raw)
In-Reply-To: <7f2c274b80fa79296005edaf52036745510a83fd.camel@xry111.site>


在 2022/9/14 下午7:15, Xi Ruoyao 写道:
> On Wed, 2022-09-14 at 18:15 +0800, Xi Ruoyao via Binutils wrote:
>
>>> Shouldn't write to got table when using hidden ifunc.
>> Perhaps it's true, using RELA to resolve a GOT entry should not depend
>> on any "initial" value of the entry...
>
> How about this?  We don't need to write into the GOT if R_LARCH_RELATIVE
> or R_LARCH_IRELATIVE will be used:
 > "We don't need to write into the GOT if R_LARCH_RELATIVE or 
R_LARCH_IRELATIVE will be used:"

Not only this, you can refer to the implementation of the function 
_bfd_elf_allocate_ifunc_dyn_relocs for details.

>
> diff --git a/bfd/elfnn-loongarch.c b/bfd/elfnn-loongarch.c
> index a9bb66a1e04..1e8ecb2b8e2 100644
> --- a/bfd/elfnn-loongarch.c
> +++ b/bfd/elfnn-loongarch.c
> @@ -3129,6 +3129,7 @@ loongarch_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
>   	      BFD_ASSERT (rel->r_addend == 0);
>   
>   	      bfd_vma got_off = 0;
> +	      bool fill_got_entry = true;
>   	      if (h != NULL)
>   		{
>   		  /* GOT ref or ifunc.  */
> @@ -3141,6 +3142,10 @@ loongarch_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
>   		  if (h->got.offset == MINUS_ONE && h->type == STT_GNU_IFUNC)
>   		    {
>   		      bfd_vma idx;
> +
> +		      /* An IFUNC is always resolved at runtime.  */
> +		      fill_got_entry = false;
> +
>   		      if (htab->elf.splt != NULL)
>   			{
>   			  idx = (h->plt.offset - PLT_HEADER_SIZE)
> @@ -3177,6 +3182,7 @@ loongarch_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
>   			  rela.r_addend = relocation;
>   			  loongarch_elf_append_rela (output_bfd,
>   						     htab->elf.srelgot, &rela);
> +			  fill_got_entry = false;
>   			}
>   		      h->got.offset |= 1;
>   		    }
> @@ -3197,12 +3203,14 @@ loongarch_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
>   			  rela.r_addend = relocation;
>   			  loongarch_elf_append_rela (output_bfd,
>   						     htab->elf.srelgot, &rela);
> +			  fill_got_entry = false;
>   			}
>   		      local_got_offsets[r_symndx] |= 1;
>   		    }
>   		}
>   
> -	      bfd_put_NN (output_bfd, relocation, got->contents + got_off);
> +	      if (fill_got_entry)
> +		bfd_put_NN (output_bfd, relocation, got->contents + got_off);
>   
>   	      relocation = got_off + sec_addr (got);
>   	    }
>


  reply	other threads:[~2022-09-15  1:47 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-09-13 15:44 [PATCH 0/2] LoongArch: Fix two bugs breaking IFUNC in static PIE Xi Ruoyao
2022-09-13 15:44 ` [PATCH 1/2] LoongArch: Avoid heap-buffer-overflow in loongarch_elf_relocate_section Xi Ruoyao
2022-09-14  8:57   ` liuzhensong
2022-09-14 10:15     ` Xi Ruoyao
2022-09-14 11:15       ` Xi Ruoyao
2022-09-15  1:47         ` liuzhensong [this message]
2022-09-15  2:56           ` Xi Ruoyao
2022-09-15  3:54             ` liuzhensong
2022-09-15  6:13               ` Xi Ruoyao
2022-09-13 15:44 ` [PATCH 2/2] LoongArch: Fix R_LARCH_IRELATIVE insertion after elf_link_sort_relocs Xi Ruoyao
2022-09-15 13:03   ` liuzhensong
2022-09-16 20:11     ` Xi Ruoyao
2022-09-18  9:58       ` Xi Ruoyao

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=6f3d0d05-c7a2-b4cf-2a3c-abb1f343ff86@loongson.cn \
    --to=liuzhensong@loongson.cn \
    --cc=binutils@sourceware.org \
    --cc=chenglulu@loongson.cn \
    --cc=i@xen0n.name \
    --cc=xry111@xry111.site \
    --cc=xuchenghua@loongson.cn \
    /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 read-only IMAP folder(s) and NNTP newsgroup(s).