linux-kernel - Re: [PATCH v8 2/6] Uprobe: Additional argument arch_uprobe to uprobe_write

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CAPhsuW71ysLTafz2y=v_dY_=0BOn0MDL0TKD6eEBQ2ZQUTBuvw@mail.gmail.com>
Date:   Sat, 11 Aug 2018 01:01:48 -0700
From:   Song Liu <liu.song.a23@...il.com>
To:     Ravi Bangoria <ravi.bangoria@...ux.ibm.com>
Cc:     srikar@...ux.vnet.ibm.com, Oleg Nesterov <oleg@...hat.com>,
        Steven Rostedt <rostedt@...dmis.org>, mhiramat@...nel.org,
        Peter Zijlstra <peterz@...radead.org>, mingo@...hat.com,
        acme@...nel.org, alexander.shishkin@...ux.intel.com,
        jolsa@...hat.com, namhyung@...nel.org,
        open list <linux-kernel@...r.kernel.org>,
        ananth@...ux.vnet.ibm.com,
        Alexis Berlemont <alexis.berlemont@...il.com>,
        naveen.n.rao@...ux.vnet.ibm.com,
        linux-arm-kernel@...ts.infradead.org, linux-mips@...ux-mips.org,
        linux@...linux.org.uk, ralf@...ux-mips.org, paul.burton@...s.com
Subject: Re: [PATCH v8 2/6] Uprobe: Additional argument arch_uprobe to uprobe_write_opcode()

On Wed, Aug 8, 2018 at 9:18 PM, Ravi Bangoria
<ravi.bangoria@...ux.ibm.com> wrote:
> Add addition argument 'arch_uprobe' to uprobe_write_opcode().
> We need this in later set of patches.
>
> Signed-off-by: Ravi Bangoria <ravi.bangoria@...ux.ibm.com>

Reviewed-by: Song Liu <songliubraving@...com>

> ---
>  arch/arm/probes/uprobes/core.c | 2 +-
>  arch/mips/kernel/uprobes.c     | 2 +-
>  include/linux/uprobes.h        | 2 +-
>  kernel/events/uprobes.c        | 9 +++++----
>  4 files changed, 8 insertions(+), 7 deletions(-)
>
> diff --git a/arch/arm/probes/uprobes/core.c b/arch/arm/probes/uprobes/core.c
> index d1329f1ba4e4..bf992264060e 100644
> --- a/arch/arm/probes/uprobes/core.c
> +++ b/arch/arm/probes/uprobes/core.c
> @@ -32,7 +32,7 @@ bool is_swbp_insn(uprobe_opcode_t *insn)
>  int set_swbp(struct arch_uprobe *auprobe, struct mm_struct *mm,
>              unsigned long vaddr)
>  {
> -       return uprobe_write_opcode(mm, vaddr,
> +       return uprobe_write_opcode(auprobe, mm, vaddr,
>                    __opcode_to_mem_arm(auprobe->bpinsn));
>  }
>
> diff --git a/arch/mips/kernel/uprobes.c b/arch/mips/kernel/uprobes.c
> index f7a0645ccb82..4aaff3b3175c 100644
> --- a/arch/mips/kernel/uprobes.c
> +++ b/arch/mips/kernel/uprobes.c
> @@ -224,7 +224,7 @@ unsigned long arch_uretprobe_hijack_return_addr(
>  int __weak set_swbp(struct arch_uprobe *auprobe, struct mm_struct *mm,
>         unsigned long vaddr)
>  {
> -       return uprobe_write_opcode(mm, vaddr, UPROBE_SWBP_INSN);
> +       return uprobe_write_opcode(auprobe, mm, vaddr, UPROBE_SWBP_INSN);
>  }
>
>  void arch_uprobe_copy_ixol(struct page *page, unsigned long vaddr,
> diff --git a/include/linux/uprobes.h b/include/linux/uprobes.h
> index 0a294e950df8..bb9d2084af03 100644
> --- a/include/linux/uprobes.h
> +++ b/include/linux/uprobes.h
> @@ -121,7 +121,7 @@ extern bool is_swbp_insn(uprobe_opcode_t *insn);
>  extern bool is_trap_insn(uprobe_opcode_t *insn);
>  extern unsigned long uprobe_get_swbp_addr(struct pt_regs *regs);
>  extern unsigned long uprobe_get_trap_addr(struct pt_regs *regs);
> -extern int uprobe_write_opcode(struct mm_struct *mm, unsigned long vaddr, uprobe_opcode_t);
> +extern int uprobe_write_opcode(struct arch_uprobe *auprobe, struct mm_struct *mm, unsigned long vaddr, uprobe_opcode_t);
>  extern int uprobe_register(struct inode *inode, loff_t offset, struct uprobe_consumer *uc);
>  extern int uprobe_apply(struct inode *inode, loff_t offset, struct uprobe_consumer *uc, bool);
>  extern void uprobe_unregister(struct inode *inode, loff_t offset, struct uprobe_consumer *uc);
> diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c
> index 471eac896635..c0418ba52ba8 100644
> --- a/kernel/events/uprobes.c
> +++ b/kernel/events/uprobes.c
> @@ -299,8 +299,8 @@ static int verify_opcode(struct page *page, unsigned long vaddr, uprobe_opcode_t
>   * Called with mm->mmap_sem held for write.
>   * Return 0 (success) or a negative errno.
>   */
> -int uprobe_write_opcode(struct mm_struct *mm, unsigned long vaddr,
> -                       uprobe_opcode_t opcode)
> +int uprobe_write_opcode(struct arch_uprobe *auprobe, struct mm_struct *mm,
> +                       unsigned long vaddr, uprobe_opcode_t opcode)
>  {
>         struct page *old_page, *new_page;
>         struct vm_area_struct *vma;
> @@ -351,7 +351,7 @@ int uprobe_write_opcode(struct mm_struct *mm, unsigned long vaddr,
>   */
>  int __weak set_swbp(struct arch_uprobe *auprobe, struct mm_struct *mm, unsigned long vaddr)
>  {
> -       return uprobe_write_opcode(mm, vaddr, UPROBE_SWBP_INSN);
> +       return uprobe_write_opcode(auprobe, mm, vaddr, UPROBE_SWBP_INSN);
>  }
>
>  /**
> @@ -366,7 +366,8 @@ int __weak set_swbp(struct arch_uprobe *auprobe, struct mm_struct *mm, unsigned
>  int __weak
>  set_orig_insn(struct arch_uprobe *auprobe, struct mm_struct *mm, unsigned long vaddr)
>  {
> -       return uprobe_write_opcode(mm, vaddr, *(uprobe_opcode_t *)&auprobe->insn);
> +       return uprobe_write_opcode(auprobe, mm, vaddr,
> +                       *(uprobe_opcode_t *)&auprobe->insn);
>  }
>
>  static struct uprobe *get_uprobe(struct uprobe *uprobe)
> --
> 2.14.4
>