26400f8207
Changes in 4.9.170 ARC: u-boot args: check that magic number is correct perf/core: Restore mmap record type correctly ext4: add missing brelse() in add_new_gdb_meta_bg() ext4: report real fs size after failed resize ALSA: echoaudio: add a check for ioremap_nocache ALSA: sb8: add a check for request_region IB/mlx4: Fix race condition between catas error reset and aliasguid flows mmc: davinci: remove extraneous __init annotation ALSA: opl3: fix mismatch between snd_opl3_drum_switch definition and declaration thermal/int340x_thermal: Add additional UUIDs thermal/int340x_thermal: fix mode setting tools/power turbostat: return the exit status of a command perf config: Fix an error in the config template documentation perf config: Fix a memory leak in collect_config() perf build-id: Fix memory leak in print_sdt_events() perf top: Fix error handling in cmd_top() perf hist: Add missing map__put() in error case perf evsel: Free evsel->counts in perf_evsel__exit() perf tests: Fix a memory leak of cpu_map object in the openat_syscall_event_on_all_cpus test perf tests: Fix a memory leak in test__perf_evsel__tp_sched_test() irqchip/mbigen: Don't clear eventid when freeing an MSI x86/hpet: Prevent potential NULL pointer dereference x86/cpu/cyrix: Use correct macros for Cyrix calls on Geode processors iommu/vt-d: Check capability before disabling protected memory x86/hw_breakpoints: Make default case in hw_breakpoint_arch_parse() return an error fix incorrect error code mapping for OBJECTID_NOT_FOUND ext4: prohibit fstrim in norecovery mode gpio: pxa: handle corner case of unprobed device rsi: improve kernel thread handling to fix kernel panic 9p: do not trust pdu content for stat item size 9p locks: add mount option for lock retry interval f2fs: fix to do sanity check with current segment number serial: uartps: console_setup() can't be placed to init section HID: i2c-hid: override HID descriptors for certain devices ARM: samsung: Limit SAMSUNG_PM_CHECK config option to non-Exynos platforms ACPI / SBS: Fix GPE storm on recent MacBookPro's cifs: fallback to older infolevels on findfirst queryinfo retry kernel: hung_task.c: disable on suspend crypto: sha256/arm - fix crash bug in Thumb2 build crypto: sha512/arm - fix crash bug in Thumb2 build iommu/dmar: Fix buffer overflow during PCI bus notification soc/tegra: pmc: Drop locking from tegra_powergate_is_powered() lkdtm: Add tests for NULL pointer dereference ARM: 8839/1: kprobe: make patch_lock a raw_spinlock_t appletalk: Fix use-after-free in atalk_proc_exit lib/div64.c: off by one in shift include/linux/swap.h: use offsetof() instead of custom __swapoffset macro tpm/tpm_crb: Avoid unaligned reads in crb_recv() net: stmmac: Set dma ring length before enabling the DMA appletalk: Fix compile regression Linux 4.9.170 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
129 lines
2.8 KiB
C
129 lines
2.8 KiB
C
#include <linux/kernel.h>
|
|
#include <linux/spinlock.h>
|
|
#include <linux/kprobes.h>
|
|
#include <linux/mm.h>
|
|
#include <linux/stop_machine.h>
|
|
|
|
#include <asm/cacheflush.h>
|
|
#include <asm/fixmap.h>
|
|
#include <asm/smp_plat.h>
|
|
#include <asm/opcodes.h>
|
|
#include <asm/patch.h>
|
|
|
|
struct patch {
|
|
void *addr;
|
|
unsigned int insn;
|
|
};
|
|
|
|
static DEFINE_RAW_SPINLOCK(patch_lock);
|
|
|
|
static void __kprobes *patch_map(void *addr, int fixmap, unsigned long *flags)
|
|
__acquires(&patch_lock)
|
|
{
|
|
unsigned int uintaddr = (uintptr_t) addr;
|
|
bool module = !core_kernel_text(uintaddr);
|
|
struct page *page;
|
|
|
|
if (module && IS_ENABLED(CONFIG_DEBUG_SET_MODULE_RONX))
|
|
page = vmalloc_to_page(addr);
|
|
else if (!module && IS_ENABLED(CONFIG_DEBUG_RODATA))
|
|
page = virt_to_page(addr);
|
|
else
|
|
return addr;
|
|
|
|
if (flags)
|
|
raw_spin_lock_irqsave(&patch_lock, *flags);
|
|
else
|
|
__acquire(&patch_lock);
|
|
|
|
set_fixmap(fixmap, page_to_phys(page));
|
|
|
|
return (void *) (__fix_to_virt(fixmap) + (uintaddr & ~PAGE_MASK));
|
|
}
|
|
|
|
static void __kprobes patch_unmap(int fixmap, unsigned long *flags)
|
|
__releases(&patch_lock)
|
|
{
|
|
clear_fixmap(fixmap);
|
|
|
|
if (flags)
|
|
raw_spin_unlock_irqrestore(&patch_lock, *flags);
|
|
else
|
|
__release(&patch_lock);
|
|
}
|
|
|
|
void __kprobes __patch_text_real(void *addr, unsigned int insn, bool remap)
|
|
{
|
|
bool thumb2 = IS_ENABLED(CONFIG_THUMB2_KERNEL);
|
|
unsigned int uintaddr = (uintptr_t) addr;
|
|
bool twopage = false;
|
|
unsigned long flags;
|
|
void *waddr = addr;
|
|
int size;
|
|
|
|
if (remap)
|
|
waddr = patch_map(addr, FIX_TEXT_POKE0, &flags);
|
|
else
|
|
__acquire(&patch_lock);
|
|
|
|
if (thumb2 && __opcode_is_thumb16(insn)) {
|
|
*(u16 *)waddr = __opcode_to_mem_thumb16(insn);
|
|
size = sizeof(u16);
|
|
} else if (thumb2 && (uintaddr & 2)) {
|
|
u16 first = __opcode_thumb32_first(insn);
|
|
u16 second = __opcode_thumb32_second(insn);
|
|
u16 *addrh0 = waddr;
|
|
u16 *addrh1 = waddr + 2;
|
|
|
|
twopage = (uintaddr & ~PAGE_MASK) == PAGE_SIZE - 2;
|
|
if (twopage && remap)
|
|
addrh1 = patch_map(addr + 2, FIX_TEXT_POKE1, NULL);
|
|
|
|
*addrh0 = __opcode_to_mem_thumb16(first);
|
|
*addrh1 = __opcode_to_mem_thumb16(second);
|
|
|
|
if (twopage && addrh1 != addr + 2) {
|
|
flush_kernel_vmap_range(addrh1, 2);
|
|
patch_unmap(FIX_TEXT_POKE1, NULL);
|
|
}
|
|
|
|
size = sizeof(u32);
|
|
} else {
|
|
if (thumb2)
|
|
insn = __opcode_to_mem_thumb32(insn);
|
|
else
|
|
insn = __opcode_to_mem_arm(insn);
|
|
|
|
*(u32 *)waddr = insn;
|
|
size = sizeof(u32);
|
|
}
|
|
|
|
if (waddr != addr) {
|
|
flush_kernel_vmap_range(waddr, twopage ? size / 2 : size);
|
|
patch_unmap(FIX_TEXT_POKE0, &flags);
|
|
} else
|
|
__release(&patch_lock);
|
|
|
|
flush_icache_range((uintptr_t)(addr),
|
|
(uintptr_t)(addr) + size);
|
|
}
|
|
|
|
static int __kprobes patch_text_stop_machine(void *data)
|
|
{
|
|
struct patch *patch = data;
|
|
|
|
__patch_text(patch->addr, patch->insn);
|
|
|
|
return 0;
|
|
}
|
|
|
|
void __kprobes patch_text(void *addr, unsigned int insn)
|
|
{
|
|
struct patch patch = {
|
|
.addr = addr,
|
|
.insn = insn,
|
|
};
|
|
|
|
stop_machine(patch_text_stop_machine, &patch, NULL);
|
|
}
|