Changes in 4.9.318 USB: new quirk for Dell Gen 2 devices ptrace/xtensa: Replace PT_SINGLESTEP with TIF_SINGLESTEP ptrace: Reimplement PTRACE_KILL by always sending SIGKILL btrfs: add "0x" prefix for unsupported optional features drm/virtio: fix NULL pointer dereference in virtio_gpu_conn_get_modes mwifiex: add mutex lock for call in mwifiex_dfs_chan_sw_work_queue b43legacy: Fix assigning negative value to unsigned variable b43: Fix assigning negative value to unsigned variable ipw2x00: Fix potential NULL dereference in libipw_xmit() ACPICA: Avoid cache flush inside virtual machines ALSA: jack: Access input_dev under mutex drm/amd/pm: fix double free in si_parse_power_table() ath9k: fix QCA9561 PA bias level media: cx25821: Fix the warning when removing the module scsi: megaraid: Fix error check return value of register_chrdev() drm/amd/pm: fix the compile warning ipv6: Don't send rs packets to the interface of ARPHRD_TUNNEL ASoC: dapm: Don't fold register value changes into notifications dma-debug: change allocation mode from GFP_NOWAIT to GFP_ATIOMIC ipmi:ssif: Check for NULL msg when handling events and messages openrisc: start CPU timer early in boot nvme-pci: fix a NULL pointer dereference in nvme_alloc_admin_tags ASoC: rt5645: Fix errorenous cleanup order media: exynos4-is: Fix compile warning rxrpc: Return an error to sendmsg if call failed eth: tg3: silence the GCC 12 array-bounds warning fs: jfs: fix possible NULL pointer dereference in dbFree() ARM: OMAP1: clock: Fix UART rate reporting algorithm fat: add ratelimit to fat*_ent_bread() ARM: versatile: Add missing of_node_put in dcscb_init ARM: dts: exynos: add atmel,24c128 fallback to Samsung EEPROM ARM: hisi: Add missing of_node_put after of_find_compatible_node PCI: Avoid pci_dev_lock() AB/BA deadlock with sriov_numvfs_store() powerpc/xics: fix refcount leak in icp_opal_init() macintosh/via-pmu: Fix build failure when CONFIG_INPUT is disabled drm: fix EDID struct for old ARM OABI format ASoC: mediatek: Fix error handling in mt8173_max98090_dev_probe x86/delay: Fix the wrong asm constraint in delay_loop() drm/mediatek: Fix mtk_cec_mask() spi: spi-ti-qspi: Fix return value handling of wait_for_completion_timeout NFC: NULL out the dev->rfkill to prevent UAF HID: hid-led: fix maximum brightness for Dream Cheeky spi: img-spfi: Fix pm_runtime_get_sync() error checking ath9k_htc: fix potential out of bounds access with invalid rxstatus->rs_keyix inotify: show inotify mask flags in proc fdinfo x86/pm: Fix false positive kmemleak report in msr_build_context() drm/msm/dsi: fix error checks and return values for DSI xmit functions drm/msm/hdmi: check return value after calling platform_get_resource_byname() drm/rockchip: vop: fix possible null-ptr-deref in vop_bind() x86/mm: Cleanup the control_va_addr_alignment() __setup handler drm/msm: return an error pointer in msm_gem_prime_get_sg_table() media: uvcvideo: Fix missing check to determine if element is found in list ASoC: mxs-saif: Fix refcount leak in mxs_saif_probe regulator: pfuze100: Fix refcount leak in pfuze_parse_regulators_dt media: exynos4-is: Change clk_disable to clk_disable_unprepare media: pvrusb2: fix array-index-out-of-bounds in pvr2_i2c_core_init Bluetooth: fix dangling sco_conn and use-after-free in sco_sock_timeout m68k: math-emu: Fix dependencies of math emulation support sctp: read sk->sk_bound_dev_if once in sctp_rcv() ASoC: wm2000: fix missing clk_disable_unprepare() on error in wm2000_anc_transition() rxrpc: Fix listen() setting the bar too high for the prealloc rings rxrpc: Don't try to resend the request if we're receiving the reply soc: qcom: smp2p: Fix missing of_node_put() in smp2p_parse_ipc soc: qcom: smsm: Fix missing of_node_put() in smsm_parse_ipc mfd: ipaq-micro: Fix error check return value of platform_get_irq() scsi: fcoe: Fix Wstringop-overflow warnings in fcoe_wwn_from_mac() drivers/base/node.c: fix compaction sysfs file leak powerpc/8xx: export 'cpm_setbrg' for modules powerpc/idle: Fix return value of __setup() handler powerpc/4xx/cpm: Fix return value of __setup() handler tty: fix deadlock caused by calling printk() under tty_port->lock Input: sparcspkr - fix refcount leak in bbc_beep_probe video: fbdev: clcdfb: Fix refcount leak in clcdfb_of_vram_setup iommu/amd: Increase timeout waiting for GA log enablement wifi: mac80211: fix use-after-free in chanctx code iwlwifi: mvm: fix assert 1F04 upon reconfig fs-writeback: writeback_sb_inodes:Recalculate 'wrote' according skipped pages ext4: fix use-after-free in ext4_rename_dir_prepare ext4: fix bug_on in ext4_writepages ext4: verify dir block before splitting it dlm: fix plock invalid read dlm: fix missing lkb refcount handling ocfs2: dlmfs: fix error handling of user_dlm_destroy_lock scsi: dc395x: Fix a missing check on list iterator scsi: ufs: qcom: Add a readl() to make sure ref_clk gets enabled drm/amdgpu/cs: make commands with 0 chunks illegal behaviour. drm/bridge: analogix_dp: Grab runtime PM reference for DP-AUX md: fix an incorrect NULL check in does_sb_need_changing md: fix an incorrect NULL check in md_reload_sb RDMA/hfi1: Fix potential integer multiplication overflow errors irqchip/armada-370-xp: Do not touch Performance Counter Overflow on A375, A38x, A39x irqchip: irq-xtensa-mx: fix initial IRQ affinity mac80211: upgrade passive scan to active scan on DFS channels after beacon rx um: chan_user: Fix winch_tramp() return value um: Fix out-of-bounds read in LDT setup iommu/msm: Fix an incorrect NULL check on list iterator nodemask.h: fix compilation error with GCC12 hugetlb: fix huge_pmd_unshare address update rtl818x: Prevent using not initialized queues ASoC: rt5514: Fix event generation for "DSP Voice Wake Up" control carl9170: tx: fix an incorrect use of list iterator gma500: fix an incorrect NULL check on list iterator docs/conf.py: Cope with removal of language=None in Sphinx 5.0.0 dt-bindings: gpio: altera: correct interrupt-cells RDMA/rxe: Generate a completion for unsupported/invalid opcode MIPS: IP27: Remove incorrect `cpu_has_fpu' override netfilter: nf_tables: disallow non-stateful expression in sets earlier pcmcia: db1xxx_ss: restrict to MIPS_DB1XXX boards staging: greybus: codecs: fix type confusion of list iterator variable usb: usbip: fix a refcount leak in stub_probe() usb: usbip: add missing device lock on tweak configuration cmd USB: storage: karma: fix rio_karma_init return pwm: lp3943: Fix duty calculation in case period was clamped rpmsg: qcom_smd: Fix irq_of_parse_and_map() return value rtc: mt6397: check return value after calling platform_get_resource() serial: meson: acquire port->lock in startup() serial: digicolor-usart: Don't allow CS5-6 serial: txx9: Don't allow CS5-6 serial: sh-sci: Don't allow CS5-6 serial: st-asc: Sanitize CSIZE and correct PARENB for CS7 firmware: dmi-sysfs: Fix memory leak in dmi_sysfs_register_handle clocksource/drivers/oxnas-rps: Fix irq_of_parse_and_map() return value net: ethernet: mtk_eth_soc: out of bounds read in mtk_hwlro_get_fdir_entry() modpost: fix removing numeric suffixes jffs2: fix memory leak in jffs2_do_fill_super tcp: tcp_rtx_synack() can be called from process context tracing: Avoid adding tracer option before update_tracer_options i2c: cadence: Increase timeout per message if necessary m68knommu: set ZERO_PAGE() to the allocated zeroed page m68knommu: fix undefined reference to `_init_sp' video: fbdev: pxa3xx-gcu: release the resources correctly in pxa3xx_gcu_probe/remove() net: fix nla_strcmp to handle more then one trailing null character ata: pata_octeon_cf: Fix refcount leak in octeon_cf_probe net/mlx4_en: Fix wrong return value on ioctl EEPROM query failure SUNRPC: Fix the calculation of xdr->end in xdr_get_next_encode_buffer() net: xfrm: unexport __init-annotated xfrm4_protocol_init() net: altera: Fix refcount leak in altera_tse_mdio_create iio: dummy: iio_simple_dummy: check the return value of kstrdup() lkdtm/usercopy: Expand size of "out of frame" object tty: synclink_gt: Fix null-pointer-dereference in slgt_clean() tty: Fix a possible resource leak in icom_probe drivers: staging: rtl8192e: Fix deadlock in rtllib_beacons_stop() USB: host: isp116x: check return value after calling platform_get_resource() drivers: tty: serial: Fix deadlock in sa1100_set_termios() drivers: usb: host: Fix deadlock in oxu_bus_suspend() USB: hcd-pci: Fully suspend across freeze/thaw cycle usb: dwc2: gadget: don't reset gadget's driver->bus misc: rtsx: set NULL intfdata when probe fails clocksource/drivers/sp804: Avoid error on multiple instances staging: rtl8712: fix uninit-value in r871xu_drv_init() serial: msm_serial: disable interrupts in __msm_console_write() md: protect md_unregister_thread from reentrancy Revert "net: af_key: add check for pfkey_broadcast in function pfkey_process" drm/radeon: fix a possible null pointer dereference modpost: fix undefined behavior of is_arm_mapping_symbol() nodemask: Fix return values to be unsigned vringh: Fix loop descriptors check in the indirect cases ALSA: hda/conexant - Fix loopback issue with CX20632 cifs: return errors during session setup during reconnects ata: libata-transport: fix {dma|pio|xfer}_mode sysfs files nfc: st21nfca: fix incorrect validating logic in EVT_TRANSACTION nfc: st21nfca: fix memory leaks in EVT_TRANSACTION handling Input: bcm5974 - set missing URB_NO_TRANSFER_DMA_MAP urb flag powerpc/32: Fix overread/overwrite of thread_struct via ptrace mtd: cfi_cmdset_0002: Move and rename chip_check/chip_ready/chip_good_for_write mtd: cfi_cmdset_0002: Use chip_ready() for write on S29GL064N PCI: qcom: Fix unbalanced PHY init on probe errors tcp: fix tcp_mtup_probe_success vs wrong snd_cwnd Linux 4.9.318 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: I2028f3dcd422886bf997ec7e1d2ae86515f1bfb9
334 lines
8.6 KiB
C
334 lines
8.6 KiB
C
/*
|
|
* This is for all the tests related to copy_to_user() and copy_from_user()
|
|
* hardening.
|
|
*/
|
|
#include "lkdtm.h"
|
|
#include <linux/slab.h>
|
|
#include <linux/vmalloc.h>
|
|
#include <linux/mman.h>
|
|
#include <linux/uaccess.h>
|
|
#include <asm/cacheflush.h>
|
|
|
|
/*
|
|
* Many of the tests here end up using const sizes, but those would
|
|
* normally be ignored by hardened usercopy, so force the compiler
|
|
* into choosing the non-const path to make sure we trigger the
|
|
* hardened usercopy checks by added "unconst" to all the const copies,
|
|
* and making sure "cache_size" isn't optimized into a const.
|
|
*/
|
|
static volatile size_t unconst = 0;
|
|
static volatile size_t cache_size = 1024;
|
|
static struct kmem_cache *bad_cache;
|
|
|
|
static const unsigned char test_text[] = "This is a test.\n";
|
|
|
|
/*
|
|
* Instead of adding -Wno-return-local-addr, just pass the stack address
|
|
* through a function to obfuscate it from the compiler.
|
|
*/
|
|
static noinline unsigned char *trick_compiler(unsigned char *stack)
|
|
{
|
|
return stack + unconst;
|
|
}
|
|
|
|
static noinline unsigned char *do_usercopy_stack_callee(int value)
|
|
{
|
|
unsigned char buf[128];
|
|
int i;
|
|
|
|
/* Exercise stack to avoid everything living in registers. */
|
|
for (i = 0; i < sizeof(buf); i++) {
|
|
buf[i] = value & 0xff;
|
|
}
|
|
|
|
/*
|
|
* Put the target buffer in the middle of stack allocation
|
|
* so that we don't step on future stack users regardless
|
|
* of stack growth direction.
|
|
*/
|
|
return trick_compiler(&buf[(128/2)-32]);
|
|
}
|
|
|
|
static noinline void do_usercopy_stack(bool to_user, bool bad_frame)
|
|
{
|
|
unsigned long user_addr;
|
|
unsigned char good_stack[32];
|
|
unsigned char *bad_stack;
|
|
int i;
|
|
|
|
/* Exercise stack to avoid everything living in registers. */
|
|
for (i = 0; i < sizeof(good_stack); i++)
|
|
good_stack[i] = test_text[i % sizeof(test_text)];
|
|
|
|
/* This is a pointer to outside our current stack frame. */
|
|
if (bad_frame) {
|
|
bad_stack = do_usercopy_stack_callee((uintptr_t)&bad_stack);
|
|
} else {
|
|
/* Put start address just inside stack. */
|
|
bad_stack = task_stack_page(current) + THREAD_SIZE;
|
|
bad_stack -= sizeof(unsigned long);
|
|
}
|
|
|
|
#ifdef ARCH_HAS_CURRENT_STACK_POINTER
|
|
pr_info("stack : %px\n", (void *)current_stack_pointer);
|
|
#endif
|
|
pr_info("good_stack: %px-%px\n", good_stack, good_stack + sizeof(good_stack));
|
|
pr_info("bad_stack : %px-%px\n", bad_stack, bad_stack + sizeof(good_stack));
|
|
|
|
user_addr = vm_mmap(NULL, 0, PAGE_SIZE,
|
|
PROT_READ | PROT_WRITE | PROT_EXEC,
|
|
MAP_ANONYMOUS | MAP_PRIVATE, 0);
|
|
if (user_addr >= TASK_SIZE) {
|
|
pr_warn("Failed to allocate user memory\n");
|
|
return;
|
|
}
|
|
|
|
if (to_user) {
|
|
pr_info("attempting good copy_to_user of local stack\n");
|
|
if (copy_to_user((void __user *)user_addr, good_stack,
|
|
unconst + sizeof(good_stack))) {
|
|
pr_warn("copy_to_user failed unexpectedly?!\n");
|
|
goto free_user;
|
|
}
|
|
|
|
pr_info("attempting bad copy_to_user of distant stack\n");
|
|
if (copy_to_user((void __user *)user_addr, bad_stack,
|
|
unconst + sizeof(good_stack))) {
|
|
pr_warn("copy_to_user failed, but lacked Oops\n");
|
|
goto free_user;
|
|
}
|
|
} else {
|
|
/*
|
|
* There isn't a safe way to not be protected by usercopy
|
|
* if we're going to write to another thread's stack.
|
|
*/
|
|
if (!bad_frame)
|
|
goto free_user;
|
|
|
|
pr_info("attempting good copy_from_user of local stack\n");
|
|
if (copy_from_user(good_stack, (void __user *)user_addr,
|
|
unconst + sizeof(good_stack))) {
|
|
pr_warn("copy_from_user failed unexpectedly?!\n");
|
|
goto free_user;
|
|
}
|
|
|
|
pr_info("attempting bad copy_from_user of distant stack\n");
|
|
if (copy_from_user(bad_stack, (void __user *)user_addr,
|
|
unconst + sizeof(good_stack))) {
|
|
pr_warn("copy_from_user failed, but lacked Oops\n");
|
|
goto free_user;
|
|
}
|
|
}
|
|
|
|
free_user:
|
|
vm_munmap(user_addr, PAGE_SIZE);
|
|
}
|
|
|
|
static void do_usercopy_heap_size(bool to_user)
|
|
{
|
|
unsigned long user_addr;
|
|
unsigned char *one, *two;
|
|
size_t size = unconst + 1024;
|
|
|
|
one = kmalloc(size, GFP_KERNEL);
|
|
two = kmalloc(size, GFP_KERNEL);
|
|
if (!one || !two) {
|
|
pr_warn("Failed to allocate kernel memory\n");
|
|
goto free_kernel;
|
|
}
|
|
|
|
user_addr = vm_mmap(NULL, 0, PAGE_SIZE,
|
|
PROT_READ | PROT_WRITE | PROT_EXEC,
|
|
MAP_ANONYMOUS | MAP_PRIVATE, 0);
|
|
if (user_addr >= TASK_SIZE) {
|
|
pr_warn("Failed to allocate user memory\n");
|
|
goto free_kernel;
|
|
}
|
|
|
|
memset(one, 'A', size);
|
|
memset(two, 'B', size);
|
|
|
|
if (to_user) {
|
|
pr_info("attempting good copy_to_user of correct size\n");
|
|
if (copy_to_user((void __user *)user_addr, one, size)) {
|
|
pr_warn("copy_to_user failed unexpectedly?!\n");
|
|
goto free_user;
|
|
}
|
|
|
|
pr_info("attempting bad copy_to_user of too large size\n");
|
|
if (copy_to_user((void __user *)user_addr, one, 2 * size)) {
|
|
pr_warn("copy_to_user failed, but lacked Oops\n");
|
|
goto free_user;
|
|
}
|
|
} else {
|
|
pr_info("attempting good copy_from_user of correct size\n");
|
|
if (copy_from_user(one, (void __user *)user_addr, size)) {
|
|
pr_warn("copy_from_user failed unexpectedly?!\n");
|
|
goto free_user;
|
|
}
|
|
|
|
pr_info("attempting bad copy_from_user of too large size\n");
|
|
if (copy_from_user(one, (void __user *)user_addr, 2 * size)) {
|
|
pr_warn("copy_from_user failed, but lacked Oops\n");
|
|
goto free_user;
|
|
}
|
|
}
|
|
|
|
free_user:
|
|
vm_munmap(user_addr, PAGE_SIZE);
|
|
free_kernel:
|
|
kfree(one);
|
|
kfree(two);
|
|
}
|
|
|
|
static void do_usercopy_heap_flag(bool to_user)
|
|
{
|
|
unsigned long user_addr;
|
|
unsigned char *good_buf = NULL;
|
|
unsigned char *bad_buf = NULL;
|
|
|
|
/* Make sure cache was prepared. */
|
|
if (!bad_cache) {
|
|
pr_warn("Failed to allocate kernel cache\n");
|
|
return;
|
|
}
|
|
|
|
/*
|
|
* Allocate one buffer from each cache (kmalloc will have the
|
|
* SLAB_USERCOPY flag already, but "bad_cache" won't).
|
|
*/
|
|
good_buf = kmalloc(cache_size, GFP_KERNEL);
|
|
bad_buf = kmem_cache_alloc(bad_cache, GFP_KERNEL);
|
|
if (!good_buf || !bad_buf) {
|
|
pr_warn("Failed to allocate buffers from caches\n");
|
|
goto free_alloc;
|
|
}
|
|
|
|
/* Allocate user memory we'll poke at. */
|
|
user_addr = vm_mmap(NULL, 0, PAGE_SIZE,
|
|
PROT_READ | PROT_WRITE | PROT_EXEC,
|
|
MAP_ANONYMOUS | MAP_PRIVATE, 0);
|
|
if (user_addr >= TASK_SIZE) {
|
|
pr_warn("Failed to allocate user memory\n");
|
|
goto free_alloc;
|
|
}
|
|
|
|
memset(good_buf, 'A', cache_size);
|
|
memset(bad_buf, 'B', cache_size);
|
|
|
|
if (to_user) {
|
|
pr_info("attempting good copy_to_user with SLAB_USERCOPY\n");
|
|
if (copy_to_user((void __user *)user_addr, good_buf,
|
|
cache_size)) {
|
|
pr_warn("copy_to_user failed unexpectedly?!\n");
|
|
goto free_user;
|
|
}
|
|
|
|
pr_info("attempting bad copy_to_user w/o SLAB_USERCOPY\n");
|
|
if (copy_to_user((void __user *)user_addr, bad_buf,
|
|
cache_size)) {
|
|
pr_warn("copy_to_user failed, but lacked Oops\n");
|
|
goto free_user;
|
|
}
|
|
} else {
|
|
pr_info("attempting good copy_from_user with SLAB_USERCOPY\n");
|
|
if (copy_from_user(good_buf, (void __user *)user_addr,
|
|
cache_size)) {
|
|
pr_warn("copy_from_user failed unexpectedly?!\n");
|
|
goto free_user;
|
|
}
|
|
|
|
pr_info("attempting bad copy_from_user w/o SLAB_USERCOPY\n");
|
|
if (copy_from_user(bad_buf, (void __user *)user_addr,
|
|
cache_size)) {
|
|
pr_warn("copy_from_user failed, but lacked Oops\n");
|
|
goto free_user;
|
|
}
|
|
}
|
|
|
|
free_user:
|
|
vm_munmap(user_addr, PAGE_SIZE);
|
|
free_alloc:
|
|
if (bad_buf)
|
|
kmem_cache_free(bad_cache, bad_buf);
|
|
kfree(good_buf);
|
|
}
|
|
|
|
/* Callable tests. */
|
|
void lkdtm_USERCOPY_HEAP_SIZE_TO(void)
|
|
{
|
|
do_usercopy_heap_size(true);
|
|
}
|
|
|
|
void lkdtm_USERCOPY_HEAP_SIZE_FROM(void)
|
|
{
|
|
do_usercopy_heap_size(false);
|
|
}
|
|
|
|
void lkdtm_USERCOPY_HEAP_FLAG_TO(void)
|
|
{
|
|
do_usercopy_heap_flag(true);
|
|
}
|
|
|
|
void lkdtm_USERCOPY_HEAP_FLAG_FROM(void)
|
|
{
|
|
do_usercopy_heap_flag(false);
|
|
}
|
|
|
|
void lkdtm_USERCOPY_STACK_FRAME_TO(void)
|
|
{
|
|
do_usercopy_stack(true, true);
|
|
}
|
|
|
|
void lkdtm_USERCOPY_STACK_FRAME_FROM(void)
|
|
{
|
|
do_usercopy_stack(false, true);
|
|
}
|
|
|
|
void lkdtm_USERCOPY_STACK_BEYOND(void)
|
|
{
|
|
do_usercopy_stack(true, false);
|
|
}
|
|
|
|
void lkdtm_USERCOPY_KERNEL(void)
|
|
{
|
|
unsigned long user_addr;
|
|
|
|
user_addr = vm_mmap(NULL, 0, PAGE_SIZE,
|
|
PROT_READ | PROT_WRITE | PROT_EXEC,
|
|
MAP_ANONYMOUS | MAP_PRIVATE, 0);
|
|
if (user_addr >= TASK_SIZE) {
|
|
pr_warn("Failed to allocate user memory\n");
|
|
return;
|
|
}
|
|
|
|
pr_info("attempting good copy_to_user from kernel rodata\n");
|
|
if (copy_to_user((void __user *)user_addr, test_text,
|
|
unconst + sizeof(test_text))) {
|
|
pr_warn("copy_to_user failed unexpectedly?!\n");
|
|
goto free_user;
|
|
}
|
|
|
|
pr_info("attempting bad copy_to_user from kernel text\n");
|
|
if (copy_to_user((void __user *)user_addr, vm_mmap,
|
|
unconst + PAGE_SIZE)) {
|
|
pr_warn("copy_to_user failed, but lacked Oops\n");
|
|
goto free_user;
|
|
}
|
|
|
|
free_user:
|
|
vm_munmap(user_addr, PAGE_SIZE);
|
|
}
|
|
|
|
void __init lkdtm_usercopy_init(void)
|
|
{
|
|
/* Prepare cache that lacks SLAB_USERCOPY flag. */
|
|
bad_cache = kmem_cache_create("lkdtm-no-usercopy", cache_size, 0,
|
|
0, NULL);
|
|
}
|
|
|
|
void __exit lkdtm_usercopy_exit(void)
|
|
{
|
|
kmem_cache_destroy(bad_cache);
|
|
}
|