Files
Petri Gynther a7d848ab42 Merge 4.9.117 into android-msm-bluecross-4.9-lts
Linux 4.9.117
    net: dsa: qca8k: Allow overwriting CPU port setting
    net: dsa: qca8k: Add QCA8334 binding documentation
    net: dsa: qca8k: Enable RXMAC when bringing up a port
    net: dsa: qca8k: Force CPU port to its highest bandwidth
    RDMA/uverbs: Protect from attempts to create flows on unsupported QP
  * ext4: check for allocation block validity with block group locked
      fs/ext4/balloc.c
      fs/ext4/ialloc.c
  * ext4: fix inline data updates with checksums enabled
      fs/ext4/inline.c
      fs/ext4/inode.c
  * squashfs: be more careful about metadata corruption
      fs/squashfs/squashfs_fs.h
  * random: mix rdrand with entropy sent in from userspace
      drivers/char/random.c
  * drm: Add DP PSR2 sink enable bit
      include/drm/drm_dp_helper.h
    media: si470x: fix __be16 annotations
    scsi: megaraid_sas: Increase timeout by 1 sec for non-RAID fastpath IOs
    scsi: scsi_dh: replace too broad "TP9" string with the exact models
    media: omap3isp: fix unbalanced dma_iommu_mapping
  * crypto: authenc - don't leak pointers to authenc keys
      crypto/authenc.c
  * crypto: authencesn - don't leak pointers to authenc keys
      crypto/authencesn.c
  * usb: hub: Don't wait for connect state at resume for powered-off ports
      drivers/usb/core/hub.c
    microblaze: Fix simpleImage format generation
  * serial: core: Make sure compiler barfs for 16-byte earlycon names
      include/linux/serial_core.h
    staging: lustre: ldlm: free resource when ldlm_lock_create() fails.
    staging: lustre: llite: correct removexattr detection
  * audit: allow not equal op for audit by executable
      kernel/auditfilter.c
    rsi: Fix 'invalid vdd' warning in mmc
  * ipconfig: Correctly initialise ic_nameservers
      net/ipv4/ipconfig.c
    drm/gma500: fix psb_intel_lvds_mode_valid()'s return type
    arm64: defconfig: Enable Rockchip io-domain driver
    memory: tegra: Apply interrupts mask per SoC
    memory: tegra: Do not handle spurious interrupts
  * stop_machine: Use raw spinlocks
      kernel/stop_machine.c
    dt-bindings: net: meson-dwmac: new compatible name for AXG SoC
    dt-bindings: pinctrl: meson: add support for the Meson8m2 SoC
    mmc: pwrseq: Use kmalloc_array instead of stack VLA
    mmc: dw_mmc: update actual clock for mmc debugfs
    ALSA: hda/ca0132: fix build failure when a local macro is defined
  * drm/atomic: Handling the case when setting old crtc for plane
      drivers/gpu/drm/drm_atomic.c
    media: siano: get rid of __le32/__le16 cast warnings
  * bpf: fix references to free_bpf_prog_info() in comments
      kernel/bpf/verifier.c
    thermal: exynos: fix setting rising_threshold for Exynos5433
    staging: lustre: o2iblnd: fix race at kiblnd_connect_peer
    scsi: megaraid: silence a static checker bug
    scsi: 3w-xxxx: fix a missing-check bug
    scsi: 3w-9xxx: fix a missing-check bug
    bnxt_en: Check unsupported speeds in bnxt_update_link() on PF only.
    perf: fix invalid bit in diagnostic entry
    s390/cpum_sf: Add data entry sizes to sampling trailer entry
    brcmfmac: Add support for bcm43364 wireless chipset
    mtd: rawnand: fsl_ifc: fix FSL NAND driver to read all ONFI parameter pages
    media: saa7164: Fix driver name in debug output
  * media: media-device: fix ioctl function types
      drivers/media/media-device.c
    libata: Fix command retry decision
    media: rcar_jpu: Add missing clk_disable_unprepare() on error in jpu_open()
  * dma-iommu: Fix compilation when !CONFIG_IOMMU_DMA
      include/linux/dma-iommu.h
  * tty: Fix data race in tty_insert_flip_string_fixed_flag
      drivers/tty/pty.c
    nvmem: properly handle returned value nvmem_reg_read
    ARM: dts: sh73a0: Add missing interrupt-affinity to PMU node
    ARM: dts: emev2: Add missing interrupt-affinity to PMU node
    EDAC, altera: Fix ARM64 build warning
    HID: i2c-hid: check if device is there before really probing
    powerpc/embedded6xx/hlwd-pic: Prevent interrupts from being handled by Starlet
    drm/radeon: fix mode_valid's return type
  * HID: hid-plantronics: Re-resend Update to map button for PTT products
      drivers/hid/hid-plantronics.c
  * arm64: cmpwait: Clear event register before arming exclusive monitor
      arch/arm64/include/asm/cmpxchg.h
  * ALSA: usb-audio: Apply rate limit to warning messages in URB complete callback
      sound/usb/pcm.c
    net: ethernet: ti: cpsw-phy-sel: check bus_find_device() ret value
    media: smiapp: fix timeout checking in smiapp_read_nvm
    ixgbevf: fix MAC address changes through ixgbevf_set_mac()
    md: fix NULL dereference of mddev->pers in remove_and_add_spares()
    regulator: pfuze100: add .is_enable() for pfuze100_swb_regulator_ops
    ALSA: emu10k1: Rate-limit error messages about page errors
  * scsi: ufs: fix exception event handling
      drivers/scsi/ufs/ufshcd.c
  * fscrypt: use unbound workqueue for decryption
      fs/crypto/crypto.c
    drivers/perf: arm-ccn: don't log to dmesg in event_init
    ima: based on policy verify firmware signatures (pre-allocated buffer)
    mwifiex: correct histogram data with appropriate index
    net: dsa: qca8k: Add support for QCA8334 switch
    PCI: pciehp: Request control of native hotplug only if supported
    bpf: powerpc64: pad function address loads with NOPs
    pinctrl: at91-pio4: add missing of_node_put
    powerpc/8xx: fix invalid register expression in head_8xx.S
    powerpc/powermac: Mark variable x as unused
    powerpc/powermac: Add missing prototype for note_bootable_part()
    powerpc/chrp/time: Make some functions static, add missing header include
    powerpc/32: Add a missing include header
    ath: Add regulatory mapping for Bahamas
    ath: Add regulatory mapping for Bermuda
    ath: Add regulatory mapping for Serbia
    ath: Add regulatory mapping for Tanzania
    ath: Add regulatory mapping for Uganda
    ath: Add regulatory mapping for APL2_FCCA
    ath: Add regulatory mapping for APL13_WORLD
    ath: Add regulatory mapping for ETSI8_WORLD
    ath: Add regulatory mapping for FCC3_ETSIC
  * PCI: Prevent sysfs disable of device while driver is attached
      drivers/pci/pci-sysfs.c
    btrfs: qgroup: Finish rescan when hit the last leaf of extent tree
    btrfs: add barriers to btrfs_sync_log before log_commit_wait wakeups
  * media: videobuf2-core: don't call memop 'finish' when queueing
      drivers/media/v4l2-core/videobuf2-core.c
    media: tw686x: Fix incorrect vb2_mem_ops GFP flags
    wlcore: sdio: check for valid platform device data before suspend
    mwifiex: handle race during mwifiex_usb_disconnect
    mfd: cros_ec: Fail early if we cannot identify the EC
  * ASoC: dpcm: fix BE dai not hw_free and shutdown
      sound/soc/soc-pcm.c
    Bluetooth: btusb: Add a new Realtek 8723DE ID 2ff8:b011
    Bluetooth: hci_qca: Fix "Sleep inside atomic section" warning
    iwlwifi: pcie: fix race in Rx buffer allocator
    selftests/intel_pstate: Improve test, minor fixes
    perf/x86/intel/uncore: Correct fixed counter index check for NHM
    perf/x86/intel/uncore: Correct fixed counter index check in generic code
    usbip: usbip_detach: Fix memory, udev context and udev leak
  * f2fs: fix race in between GC and atomic open
      fs/f2fs/file.c
  * f2fs: Fix deadlock in shutdown ioctl
      fs/f2fs/file.c
  * f2fs: fix to wait page writeback during revoking atomic write
      fs/f2fs/segment.c
  * f2fs: fix to don't trigger writeback during recovery
      fs/f2fs/segment.c
  * f2fs: fix error path of move_data_page
      fs/f2fs/gc.c
  * disable loading f2fs module on PAGE_SIZE > 4KB
      fs/f2fs/super.c
    pnfs: Don't release the sequence slot until we've processed layoutget on open
    netfilter: nf_tables: check msg_type before nft_trans_set(trans)
    RDMA/mad: Convert BUG_ONs to error flows
    powerpc/64s: Fix compiler store ordering to SLB shadow area
    hvc_opal: don't set tb_ticks_per_usec in udbg_init_opal_common()
    powerpc/eeh: Fix use-after-release of EEH driver
    infiniband: fix a possible use-after-free bug
    netfilter: ipset: List timing out entries with "timeout 1" instead of zero
    perf tools: Fix pmu events parsing rule
  * rtc: ensure rtc_set_alarm fails when alarms are not supported
      drivers/rtc/interface.c
  * mm/slub.c: add __printf verification to slab_err()
      mm/slub.c
  * mm: vmalloc: avoid racy handling of debugobjects in vunmap
      mm/vmalloc.c
    vfio: platform: Fix reset module leak in error path
    nfsd: fix potential use-after-free in nfsd4_decode_getdeviceinfo
    ALSA: fm801: add error handling for snd_ctl_add
    ALSA: emu10k1: add error handling for snd_ctl_add
    xen/netfront: raise max number of slots in xennet_get_responses()
    kcov: ensure irq code sees a valid area
    usb: dwc2: Fix DMA alignment to start at allocated boundary
  * arm64: fix vmemmap BUILD_BUG_ON() triggering on !vmemmap setups
      arch/arm64/mm/init.c
  * tracing: Quiet gcc warning about maybe unused link variable
      kernel/trace/trace_kprobe.c
  * tracing/kprobes: Fix trace_probe flags on enable_trace_kprobe() failure
      kernel/trace/trace_kprobe.c
  * kthread, tracing: Don't expose half-written comm when creating kthreads
      kernel/kthread.c
  * tracing: Fix possible double free in event_enable_trigger_func()
      kernel/trace/trace_events_trigger.c
  * tracing: Fix double free of event_trigger_data
      kernel/trace/trace_events_trigger.c
    kvm, mm: account shadow page tables to kmemcg
    Input: elan_i2c - add another ACPI ID for Lenovo Ideapad 330-15AST
    Input: i8042 - add Lenovo LaVie Z to the i8042 reset list
    Input: elan_i2c - add ACPI ID for lenovo ideapad 330

Change-Id: Ibdefd19225c51396172426223364ca861da5f5a0
Signed-off-by: Petri Gynther <pgynther@google.com>
2018-09-20 18:54:56 -07:00

440 lines
11 KiB
C

#define pr_fmt(fmt) "kcov: " fmt
#define DISABLE_BRANCH_PROFILING
#include <linux/atomic.h>
#include <linux/compiler.h>
#include <linux/errno.h>
#include <linux/export.h>
#include <linux/types.h>
#include <linux/file.h>
#include <linux/fs.h>
#include <linux/init.h>
#include <linux/mm.h>
#include <linux/preempt.h>
#include <linux/printk.h>
#include <linux/sched.h>
#include <linux/slab.h>
#include <linux/spinlock.h>
#include <linux/vmalloc.h>
#include <linux/debugfs.h>
#include <linux/uaccess.h>
#include <linux/kcov.h>
#include <asm/setup.h>
/* Number of 64-bit words written per one comparison: */
#define KCOV_WORDS_PER_CMP 4
/*
* kcov descriptor (one per opened debugfs file).
* State transitions of the descriptor:
* - initial state after open()
* - then there must be a single ioctl(KCOV_INIT_TRACE) call
* - then, mmap() call (several calls are allowed but not useful)
* - then, ioctl(KCOV_ENABLE, arg), where arg is
* KCOV_TRACE_PC - to trace only the PCs
* or
* KCOV_TRACE_CMP - to trace only the comparison operands
* - then, ioctl(KCOV_DISABLE) to disable the task.
* Enabling/disabling ioctls can be repeated (only one task a time allowed).
*/
struct kcov {
/*
* Reference counter. We keep one for:
* - opened file descriptor
* - task with enabled coverage (we can't unwire it from another task)
*/
atomic_t refcount;
/* The lock protects mode, size, area and t. */
spinlock_t lock;
enum kcov_mode mode;
/* Size of arena (in long's for KCOV_MODE_TRACE). */
unsigned size;
/* Coverage buffer shared with user space. */
void *area;
/* Task for which we collect coverage, or NULL. */
struct task_struct *t;
};
static bool check_kcov_mode(enum kcov_mode needed_mode, struct task_struct *t)
{
enum kcov_mode mode;
/*
* We are interested in code coverage as a function of a syscall inputs,
* so we ignore code executed in interrupts.
*/
if (!in_task())
return false;
mode = READ_ONCE(t->kcov_mode);
/*
* There is some code that runs in interrupts but for which
* in_interrupt() returns false (e.g. preempt_schedule_irq()).
* READ_ONCE()/barrier() effectively provides load-acquire wrt
* interrupts, there are paired barrier()/WRITE_ONCE() in
* kcov_ioctl_locked().
*/
barrier();
return mode == needed_mode;
}
static unsigned long canonicalize_ip(unsigned long ip)
{
#ifdef CONFIG_RANDOMIZE_BASE
ip -= kaslr_offset();
#endif
return ip;
}
/*
* Entry point from instrumented code.
* This is called once per basic-block/edge.
*/
void notrace __sanitizer_cov_trace_pc(void)
{
struct task_struct *t;
unsigned long *area;
unsigned long ip = canonicalize_ip(_RET_IP_);
unsigned long pos;
t = current;
if (!check_kcov_mode(KCOV_MODE_TRACE_PC, t))
return;
area = t->kcov_area;
/* The first 64-bit word is the number of subsequent PCs. */
pos = READ_ONCE(area[0]) + 1;
if (likely(pos < t->kcov_size)) {
area[pos] = ip;
WRITE_ONCE(area[0], pos);
}
}
EXPORT_SYMBOL(__sanitizer_cov_trace_pc);
#ifdef CONFIG_KCOV_ENABLE_COMPARISONS
static void write_comp_data(u64 type, u64 arg1, u64 arg2, u64 ip)
{
struct task_struct *t;
u64 *area;
u64 count, start_index, end_pos, max_pos;
t = current;
if (!check_kcov_mode(KCOV_MODE_TRACE_CMP, t))
return;
ip = canonicalize_ip(ip);
/*
* We write all comparison arguments and types as u64.
* The buffer was allocated for t->kcov_size unsigned longs.
*/
area = (u64 *)t->kcov_area;
max_pos = t->kcov_size * sizeof(unsigned long);
count = READ_ONCE(area[0]);
/* Every record is KCOV_WORDS_PER_CMP 64-bit words. */
start_index = 1 + count * KCOV_WORDS_PER_CMP;
end_pos = (start_index + KCOV_WORDS_PER_CMP) * sizeof(u64);
if (likely(end_pos <= max_pos)) {
area[start_index] = type;
area[start_index + 1] = arg1;
area[start_index + 2] = arg2;
area[start_index + 3] = ip;
WRITE_ONCE(area[0], count + 1);
}
}
void notrace __sanitizer_cov_trace_cmp1(u8 arg1, u8 arg2)
{
write_comp_data(KCOV_CMP_SIZE(0), arg1, arg2, _RET_IP_);
}
EXPORT_SYMBOL(__sanitizer_cov_trace_cmp1);
void notrace __sanitizer_cov_trace_cmp2(u16 arg1, u16 arg2)
{
write_comp_data(KCOV_CMP_SIZE(1), arg1, arg2, _RET_IP_);
}
EXPORT_SYMBOL(__sanitizer_cov_trace_cmp2);
void notrace __sanitizer_cov_trace_cmp4(u32 arg1, u32 arg2)
{
write_comp_data(KCOV_CMP_SIZE(2), arg1, arg2, _RET_IP_);
}
EXPORT_SYMBOL(__sanitizer_cov_trace_cmp4);
void notrace __sanitizer_cov_trace_cmp8(u64 arg1, u64 arg2)
{
write_comp_data(KCOV_CMP_SIZE(3), arg1, arg2, _RET_IP_);
}
EXPORT_SYMBOL(__sanitizer_cov_trace_cmp8);
void notrace __sanitizer_cov_trace_const_cmp1(u8 arg1, u8 arg2)
{
write_comp_data(KCOV_CMP_SIZE(0) | KCOV_CMP_CONST, arg1, arg2,
_RET_IP_);
}
EXPORT_SYMBOL(__sanitizer_cov_trace_const_cmp1);
void notrace __sanitizer_cov_trace_const_cmp2(u16 arg1, u16 arg2)
{
write_comp_data(KCOV_CMP_SIZE(1) | KCOV_CMP_CONST, arg1, arg2,
_RET_IP_);
}
EXPORT_SYMBOL(__sanitizer_cov_trace_const_cmp2);
void notrace __sanitizer_cov_trace_const_cmp4(u32 arg1, u32 arg2)
{
write_comp_data(KCOV_CMP_SIZE(2) | KCOV_CMP_CONST, arg1, arg2,
_RET_IP_);
}
EXPORT_SYMBOL(__sanitizer_cov_trace_const_cmp4);
void notrace __sanitizer_cov_trace_const_cmp8(u64 arg1, u64 arg2)
{
write_comp_data(KCOV_CMP_SIZE(3) | KCOV_CMP_CONST, arg1, arg2,
_RET_IP_);
}
EXPORT_SYMBOL(__sanitizer_cov_trace_const_cmp8);
void notrace __sanitizer_cov_trace_switch(u64 val, u64 *cases)
{
u64 i;
u64 count = cases[0];
u64 size = cases[1];
u64 type = KCOV_CMP_CONST;
switch (size) {
case 8:
type |= KCOV_CMP_SIZE(0);
break;
case 16:
type |= KCOV_CMP_SIZE(1);
break;
case 32:
type |= KCOV_CMP_SIZE(2);
break;
case 64:
type |= KCOV_CMP_SIZE(3);
break;
default:
return;
}
for (i = 0; i < count; i++)
write_comp_data(type, cases[i + 2], val, _RET_IP_);
}
EXPORT_SYMBOL(__sanitizer_cov_trace_switch);
#endif /* ifdef CONFIG_KCOV_ENABLE_COMPARISONS */
static void kcov_get(struct kcov *kcov)
{
atomic_inc(&kcov->refcount);
}
static void kcov_put(struct kcov *kcov)
{
if (atomic_dec_and_test(&kcov->refcount)) {
vfree(kcov->area);
kfree(kcov);
}
}
void kcov_task_init(struct task_struct *t)
{
WRITE_ONCE(t->kcov_mode, KCOV_MODE_DISABLED);
barrier();
t->kcov_size = 0;
t->kcov_area = NULL;
t->kcov = NULL;
}
void kcov_task_exit(struct task_struct *t)
{
struct kcov *kcov;
kcov = t->kcov;
if (kcov == NULL)
return;
spin_lock(&kcov->lock);
if (WARN_ON(kcov->t != t)) {
spin_unlock(&kcov->lock);
return;
}
/* Just to not leave dangling references behind. */
kcov_task_init(t);
kcov->t = NULL;
kcov->mode = KCOV_MODE_INIT;
spin_unlock(&kcov->lock);
kcov_put(kcov);
}
static int kcov_mmap(struct file *filep, struct vm_area_struct *vma)
{
int res = 0;
void *area;
struct kcov *kcov = vma->vm_file->private_data;
unsigned long size, off;
struct page *page;
area = vmalloc_user(vma->vm_end - vma->vm_start);
if (!area)
return -ENOMEM;
spin_lock(&kcov->lock);
size = kcov->size * sizeof(unsigned long);
if (kcov->mode != KCOV_MODE_INIT || vma->vm_pgoff != 0 ||
vma->vm_end - vma->vm_start != size) {
res = -EINVAL;
goto exit;
}
if (!kcov->area) {
kcov->area = area;
vma->vm_flags |= VM_DONTEXPAND;
spin_unlock(&kcov->lock);
for (off = 0; off < size; off += PAGE_SIZE) {
page = vmalloc_to_page(kcov->area + off);
if (vm_insert_page(vma, vma->vm_start + off, page))
WARN_ONCE(1, "vm_insert_page() failed");
}
return 0;
}
exit:
spin_unlock(&kcov->lock);
vfree(area);
return res;
}
static int kcov_open(struct inode *inode, struct file *filep)
{
struct kcov *kcov;
kcov = kzalloc(sizeof(*kcov), GFP_KERNEL);
if (!kcov)
return -ENOMEM;
kcov->mode = KCOV_MODE_DISABLED;
atomic_set(&kcov->refcount, 1);
spin_lock_init(&kcov->lock);
filep->private_data = kcov;
return nonseekable_open(inode, filep);
}
static int kcov_close(struct inode *inode, struct file *filep)
{
kcov_put(filep->private_data);
return 0;
}
static int kcov_ioctl_locked(struct kcov *kcov, unsigned int cmd,
unsigned long arg)
{
struct task_struct *t;
unsigned long size, unused;
switch (cmd) {
case KCOV_INIT_TRACE:
/*
* Enable kcov in trace mode and setup buffer size.
* Must happen before anything else.
*/
if (kcov->mode != KCOV_MODE_DISABLED)
return -EBUSY;
/*
* Size must be at least 2 to hold current position and one PC.
* Later we allocate size * sizeof(unsigned long) memory,
* that must not overflow.
*/
size = arg;
if (size < 2 || size > INT_MAX / sizeof(unsigned long))
return -EINVAL;
kcov->size = size;
kcov->mode = KCOV_MODE_INIT;
return 0;
case KCOV_ENABLE:
/*
* Enable coverage for the current task.
* At this point user must have been enabled trace mode,
* and mmapped the file. Coverage collection is disabled only
* at task exit or voluntary by KCOV_DISABLE. After that it can
* be enabled for another task.
*/
if (kcov->mode != KCOV_MODE_INIT || !kcov->area)
return -EINVAL;
if (kcov->t != NULL)
return -EBUSY;
if (arg == KCOV_TRACE_PC)
kcov->mode = KCOV_MODE_TRACE_PC;
else if (arg == KCOV_TRACE_CMP)
#ifdef CONFIG_KCOV_ENABLE_COMPARISONS
kcov->mode = KCOV_MODE_TRACE_CMP;
#else
return -ENOTSUPP;
#endif
else
return -EINVAL;
t = current;
if (kcov->t != NULL || t->kcov != NULL)
return -EBUSY;
/* Cache in task struct for performance. */
t->kcov_size = kcov->size;
t->kcov_area = kcov->area;
/* See comment in check_kcov_mode(). */
barrier();
WRITE_ONCE(t->kcov_mode, kcov->mode);
t->kcov = kcov;
kcov->t = t;
/* This is put either in kcov_task_exit() or in KCOV_DISABLE. */
kcov_get(kcov);
return 0;
case KCOV_DISABLE:
/* Disable coverage for the current task. */
unused = arg;
if (unused != 0 || current->kcov != kcov)
return -EINVAL;
t = current;
if (WARN_ON(kcov->t != t))
return -EINVAL;
kcov_task_init(t);
kcov->t = NULL;
kcov->mode = KCOV_MODE_INIT;
kcov_put(kcov);
return 0;
default:
return -ENOTTY;
}
}
static long kcov_ioctl(struct file *filep, unsigned int cmd, unsigned long arg)
{
struct kcov *kcov;
int res;
kcov = filep->private_data;
spin_lock(&kcov->lock);
res = kcov_ioctl_locked(kcov, cmd, arg);
spin_unlock(&kcov->lock);
return res;
}
static const struct file_operations kcov_fops = {
.open = kcov_open,
.unlocked_ioctl = kcov_ioctl,
.compat_ioctl = kcov_ioctl,
.mmap = kcov_mmap,
.release = kcov_close,
};
static int __init kcov_init(void)
{
/*
* The kcov debugfs file won't ever get removed and thus,
* there is no need to protect it against removal races. The
* use of debugfs_create_file_unsafe() is actually safe here.
*/
if (!debugfs_create_file_unsafe("kcov", 0600, NULL, NULL, &kcov_fops)) {
pr_err("failed to create kcov in debugfs\n");
return -ENOMEM;
}
return 0;
}
device_initcall(kcov_init);