Changes in 4.9.185 tracing: Silence GCC 9 array bounds warning gcc-9: silence 'address-of-packed-member' warning scsi: ufs: Avoid runtime suspend possibly being blocked forever usb: chipidea: udc: workaround for endpoint conflict issue IB/hfi1: Silence txreq allocation warnings Input: uinput - add compat ioctl number translation for UI_*_FF_UPLOAD apparmor: enforce nullbyte at end of tag string ARC: fix build warnings with !CONFIG_KPROBES parport: Fix mem leak in parport_register_dev_model parisc: Fix compiler warnings in float emulation code IB/rdmavt: Fix alloc_qpn() WARN_ON() IB/hfi1: Insure freeze_work work_struct is canceled on shutdown IB/{qib, hfi1, rdmavt}: Correct ibv_devinfo max_mr value MIPS: uprobes: remove set but not used variable 'epc' net: dsa: mv88e6xxx: avoid error message on remove from VLAN 0 net: hns: Fix loopback test failed at copper ports sparc: perf: fix updated event period in response to PERF_EVENT_IOC_PERIOD net: ethernet: mediatek: Use hw_feature to judge if HWLRO is supported net: ethernet: mediatek: Use NET_IP_ALIGN to judge if HW RX_2BYTE_OFFSET is enabled drm/arm/hdlcd: Allow a bit of clock tolerance scripts/checkstack.pl: Fix arm64 wrong or unknown architecture scsi: ufs: Check that space was properly alloced in copy_query_response s390/qeth: fix VLAN attribute in bridge_hostnotify udev event hwmon: (pmbus/core) Treat parameters as paged if on multiple pages nvme: Fix u32 overflow in the number of namespace list calculation btrfs: start readahead also in seed devices can: flexcan: fix timeout when set small bitrate can: purge socket error queue on sock destruct powerpc/bpf: use unsigned division instruction for 64-bit operations ARM: imx: cpuidle-imx6sx: Restrict the SW2ISO increase to i.MX6SX Bluetooth: Align minimum encryption key size for LE and BR/EDR connections Bluetooth: Fix regression with minimum encryption key size alignment cfg80211: fix memory leak of wiphy device name mac80211: drop robust management frames from unknown TA mac80211: Do not use stack memory with scatterlist for GMAC IB/hfi1: Avoid hardlockup with flushlist_lock perf ui helpline: Use strlcpy() as a shorter form of strncpy() + explicit set nul perf help: Remove needless use of strncpy() perf header: Fix unchecked usage of strncpy() 9p/rdma: do not disconnect on down_interruptible EAGAIN 9p: acl: fix uninitialized iattr access 9p/rdma: remove useless check in cm_event_handler 9p: p9dirent_read: check network-provided name length net/9p: include trans_common.h to fix missing prototype warning. fs/proc/array.c: allow reporting eip/esp for all coredumping threads fs/binfmt_flat.c: make load_flat_shared_library() work mm/page_idle.c: fix oops because end_pfn is larger than max_pfn scsi: vmw_pscsi: Fix use-after-free in pvscsi_queue_lck() x86/speculation: Allow guests to use SSBD even if host does not NFS/flexfiles: Use the correct TCP timeout for flexfiles I/O cpu/speculation: Warn on unsupported mitigations= parameter af_packet: Block execution of tasks waiting for transmit to complete in AF_PACKET net: stmmac: fixed new system time seconds value calculation sctp: change to hold sk after auth shkey is created successfully tipc: change to use register_pernet_device tipc: check msg->req data len in tipc_nl_compat_bearer_disable tun: wake up waitqueues after IFF_UP is set team: Always enable vlan tx offload bonding: Always enable vlan tx offload ipv4: Use return value of inet_iif() for __raw_v4_lookup in the while loop bpf: udp: Avoid calling reuseport's bpf_prog from udp_gro bpf: udp: ipv6: Avoid running reuseport's bpf_prog from __udp6_lib_err tipc: pass tunnel dev as NULL to udp_tunnel(6)_xmit_skb Bluetooth: Fix faulty expression for minimum encryption key size check ASoC : cs4265 : readable register too low ASoC: soc-pcm: BE dai needs prepare when pause release after resume spi: bitbang: Fix NULL pointer dereference in spi_unregister_master drm/mediatek: fix unbind functions ASoC: max98090: remove 24-bit format support if RJ is 0 usb: gadget: fusb300_udc: Fix memory leak of fusb300->ep[i] usb: gadget: udc: lpc32xx: allocate descriptor with GFP_ATOMIC scsi: hpsa: correct ioaccel2 chaining scripts/decode_stacktrace.sh: prefix addr2line with $CROSS_COMPILE mm/mlock.c: change count_mm_mlocked_page_nr return type MIPS: math-emu: do not use bools for arithmetic MIPS: netlogic: xlr: Remove erroneous check in nlm_fmn_send() mfd: omap-usb-tll: Fix register offsets ARC: fix allnoconfig build warning bug.h: work around GCC PR82365 in BUG() ARC: handle gcc generated __builtin_trap for older compiler clk: sunxi: fix uninitialized access KVM: x86: degrade WARN to pr_warn_ratelimited drm/i915/dmc: protect against reading random memory MIPS: Workaround GCC __builtin_unreachable reordering bug ptrace: Fix ->ptracer_cred handling for PTRACE_TRACEME crypto: user - prevent operating on larval algorithms ALSA: seq: fix incorrect order of dest_client/dest_ports arguments ALSA: firewire-lib/fireworks: fix miss detection of received MIDI messages ALSA: line6: Fix write on zero-sized buffer ALSA: usb-audio: fix sign unintended sign extension on left shifts lib/mpi: Fix karactx leak in mpi_powm drm/imx: notify drm core before sending event during crtc disable drm/imx: only send event on crtc disable if kept disabled btrfs: Ensure replaced device doesn't have pending chunk allocation tty: rocket: fix incorrect forward declaration of 'rp_init()' arm64, vdso: Define vdso_{start,end} as array KVM: LAPIC: Fix pending interrupt in IRR blocked by software disable LAPIC IB/hfi1: Close PSM sdma_progress sleep window MIPS: Add missing EHB in mtc0 -> mfc0 sequence. dmaengine: imx-sdma: remove BD_INTR for channel0 arm64: kaslr: keep modules inside module region when KASAN is enabled Linux 4.9.185 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
262 lines
6.5 KiB
C
262 lines
6.5 KiB
C
#include <linux/highmem.h>
|
|
#include <linux/kdebug.h>
|
|
#include <linux/types.h>
|
|
#include <linux/notifier.h>
|
|
#include <linux/sched.h>
|
|
#include <linux/uprobes.h>
|
|
|
|
#include <asm/branch.h>
|
|
#include <asm/cpu-features.h>
|
|
#include <asm/ptrace.h>
|
|
|
|
#include "probes-common.h"
|
|
|
|
static inline int insn_has_delay_slot(const union mips_instruction insn)
|
|
{
|
|
return __insn_has_delay_slot(insn);
|
|
}
|
|
|
|
/**
|
|
* arch_uprobe_analyze_insn - instruction analysis including validity and fixups.
|
|
* @mm: the probed address space.
|
|
* @arch_uprobe: the probepoint information.
|
|
* @addr: virtual address at which to install the probepoint
|
|
* Return 0 on success or a -ve number on error.
|
|
*/
|
|
int arch_uprobe_analyze_insn(struct arch_uprobe *aup,
|
|
struct mm_struct *mm, unsigned long addr)
|
|
{
|
|
union mips_instruction inst;
|
|
|
|
/*
|
|
* For the time being this also blocks attempts to use uprobes with
|
|
* MIPS16 and microMIPS.
|
|
*/
|
|
if (addr & 0x03)
|
|
return -EINVAL;
|
|
|
|
inst.word = aup->insn[0];
|
|
|
|
if (__insn_is_compact_branch(inst)) {
|
|
pr_notice("Uprobes for compact branches are not supported\n");
|
|
return -EINVAL;
|
|
}
|
|
|
|
aup->ixol[0] = aup->insn[insn_has_delay_slot(inst)];
|
|
aup->ixol[1] = UPROBE_BRK_UPROBE_XOL; /* NOP */
|
|
|
|
return 0;
|
|
}
|
|
|
|
/**
|
|
* is_trap_insn - check if the instruction is a trap variant
|
|
* @insn: instruction to be checked.
|
|
* Returns true if @insn is a trap variant.
|
|
*
|
|
* This definition overrides the weak definition in kernel/events/uprobes.c.
|
|
* and is needed for the case where an architecture has multiple trap
|
|
* instructions (like PowerPC or MIPS). We treat BREAK just like the more
|
|
* modern conditional trap instructions.
|
|
*/
|
|
bool is_trap_insn(uprobe_opcode_t *insn)
|
|
{
|
|
union mips_instruction inst;
|
|
|
|
inst.word = *insn;
|
|
|
|
switch (inst.i_format.opcode) {
|
|
case spec_op:
|
|
switch (inst.r_format.func) {
|
|
case break_op:
|
|
case teq_op:
|
|
case tge_op:
|
|
case tgeu_op:
|
|
case tlt_op:
|
|
case tltu_op:
|
|
case tne_op:
|
|
return 1;
|
|
}
|
|
break;
|
|
|
|
case bcond_op: /* Yes, really ... */
|
|
switch (inst.u_format.rt) {
|
|
case teqi_op:
|
|
case tgei_op:
|
|
case tgeiu_op:
|
|
case tlti_op:
|
|
case tltiu_op:
|
|
case tnei_op:
|
|
return 1;
|
|
}
|
|
break;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
#define UPROBE_TRAP_NR ULONG_MAX
|
|
|
|
/*
|
|
* arch_uprobe_pre_xol - prepare to execute out of line.
|
|
* @auprobe: the probepoint information.
|
|
* @regs: reflects the saved user state of current task.
|
|
*/
|
|
int arch_uprobe_pre_xol(struct arch_uprobe *aup, struct pt_regs *regs)
|
|
{
|
|
struct uprobe_task *utask = current->utask;
|
|
|
|
/*
|
|
* Now find the EPC where to resume after the breakpoint has been
|
|
* dealt with. This may require emulation of a branch.
|
|
*/
|
|
aup->resume_epc = regs->cp0_epc + 4;
|
|
if (insn_has_delay_slot((union mips_instruction) aup->insn[0])) {
|
|
__compute_return_epc_for_insn(regs,
|
|
(union mips_instruction) aup->insn[0]);
|
|
aup->resume_epc = regs->cp0_epc;
|
|
}
|
|
utask->autask.saved_trap_nr = current->thread.trap_nr;
|
|
current->thread.trap_nr = UPROBE_TRAP_NR;
|
|
regs->cp0_epc = current->utask->xol_vaddr;
|
|
|
|
return 0;
|
|
}
|
|
|
|
int arch_uprobe_post_xol(struct arch_uprobe *aup, struct pt_regs *regs)
|
|
{
|
|
struct uprobe_task *utask = current->utask;
|
|
|
|
current->thread.trap_nr = utask->autask.saved_trap_nr;
|
|
regs->cp0_epc = aup->resume_epc;
|
|
|
|
return 0;
|
|
}
|
|
|
|
/*
|
|
* If xol insn itself traps and generates a signal(Say,
|
|
* SIGILL/SIGSEGV/etc), then detect the case where a singlestepped
|
|
* instruction jumps back to its own address. It is assumed that anything
|
|
* like do_page_fault/do_trap/etc sets thread.trap_nr != -1.
|
|
*
|
|
* arch_uprobe_pre_xol/arch_uprobe_post_xol save/restore thread.trap_nr,
|
|
* arch_uprobe_xol_was_trapped() simply checks that ->trap_nr is not equal to
|
|
* UPROBE_TRAP_NR == -1 set by arch_uprobe_pre_xol().
|
|
*/
|
|
bool arch_uprobe_xol_was_trapped(struct task_struct *tsk)
|
|
{
|
|
if (tsk->thread.trap_nr != UPROBE_TRAP_NR)
|
|
return true;
|
|
|
|
return false;
|
|
}
|
|
|
|
int arch_uprobe_exception_notify(struct notifier_block *self,
|
|
unsigned long val, void *data)
|
|
{
|
|
struct die_args *args = data;
|
|
struct pt_regs *regs = args->regs;
|
|
|
|
/* regs == NULL is a kernel bug */
|
|
if (WARN_ON(!regs))
|
|
return NOTIFY_DONE;
|
|
|
|
/* We are only interested in userspace traps */
|
|
if (!user_mode(regs))
|
|
return NOTIFY_DONE;
|
|
|
|
switch (val) {
|
|
case DIE_UPROBE:
|
|
if (uprobe_pre_sstep_notifier(regs))
|
|
return NOTIFY_STOP;
|
|
break;
|
|
case DIE_UPROBE_XOL:
|
|
if (uprobe_post_sstep_notifier(regs))
|
|
return NOTIFY_STOP;
|
|
default:
|
|
break;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
/*
|
|
* This function gets called when XOL instruction either gets trapped or
|
|
* the thread has a fatal signal. Reset the instruction pointer to its
|
|
* probed address for the potential restart or for post mortem analysis.
|
|
*/
|
|
void arch_uprobe_abort_xol(struct arch_uprobe *aup,
|
|
struct pt_regs *regs)
|
|
{
|
|
struct uprobe_task *utask = current->utask;
|
|
|
|
instruction_pointer_set(regs, utask->vaddr);
|
|
}
|
|
|
|
unsigned long arch_uretprobe_hijack_return_addr(
|
|
unsigned long trampoline_vaddr, struct pt_regs *regs)
|
|
{
|
|
unsigned long ra;
|
|
|
|
ra = regs->regs[31];
|
|
|
|
/* Replace the return address with the trampoline address */
|
|
regs->regs[31] = trampoline_vaddr;
|
|
|
|
return ra;
|
|
}
|
|
|
|
/**
|
|
* set_swbp - store breakpoint at a given address.
|
|
* @auprobe: arch specific probepoint information.
|
|
* @mm: the probed process address space.
|
|
* @vaddr: the virtual address to insert the opcode.
|
|
*
|
|
* For mm @mm, store the breakpoint instruction at @vaddr.
|
|
* Return 0 (success) or a negative errno.
|
|
*
|
|
* This version overrides the weak version in kernel/events/uprobes.c.
|
|
* It is required to handle MIPS16 and microMIPS.
|
|
*/
|
|
int __weak set_swbp(struct arch_uprobe *auprobe, struct mm_struct *mm,
|
|
unsigned long vaddr)
|
|
{
|
|
return uprobe_write_opcode(mm, vaddr, UPROBE_SWBP_INSN);
|
|
}
|
|
|
|
void __weak arch_uprobe_copy_ixol(struct page *page, unsigned long vaddr,
|
|
void *src, unsigned long len)
|
|
{
|
|
unsigned long kaddr, kstart;
|
|
|
|
/* Initialize the slot */
|
|
kaddr = (unsigned long)kmap_atomic(page);
|
|
kstart = kaddr + (vaddr & ~PAGE_MASK);
|
|
memcpy((void *)kstart, src, len);
|
|
flush_icache_range(kstart, kstart + len);
|
|
kunmap_atomic((void *)kaddr);
|
|
}
|
|
|
|
/**
|
|
* uprobe_get_swbp_addr - compute address of swbp given post-swbp regs
|
|
* @regs: Reflects the saved state of the task after it has hit a breakpoint
|
|
* instruction.
|
|
* Return the address of the breakpoint instruction.
|
|
*
|
|
* This overrides the weak version in kernel/events/uprobes.c.
|
|
*/
|
|
unsigned long uprobe_get_swbp_addr(struct pt_regs *regs)
|
|
{
|
|
return instruction_pointer(regs);
|
|
}
|
|
|
|
/*
|
|
* See if the instruction can be emulated.
|
|
* Returns true if instruction was emulated, false otherwise.
|
|
*
|
|
* For now we always emulate so this function just returns 0.
|
|
*/
|
|
bool arch_uprobe_skip_sstep(struct arch_uprobe *auprobe, struct pt_regs *regs)
|
|
{
|
|
return 0;
|
|
}
|