diff mbox series

[107/118] fs/binfmt_elf.c: make BAD_ADDR() unlikely

Message ID	20200131061701.HImshoCG3%akpm@linux-foundation.org (mailing list archive)
State	New, archived
Headers	show Return-Path: <SRS0=fNDf=3U=kvack.org=owner-linux-mm@kernel.org> DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 58BB22467B Date: Thu, 30 Jan 2020 22:17:01 -0800 From: Andrew Morton <akpm@linux-foundation.org> To: adobriyan@gmail.com, akpm@linux-foundation.org, linux-mm@kvack.org, mm-commits@vger.kernel.org, torvalds@linux-foundation.org Subject: [patch 107/118] fs/binfmt_elf.c: make BAD_ADDR() unlikely Message-ID: <20200131061701.HImshoCG3%akpm@linux-foundation.org> In-Reply-To: <20200130221021.5f0211c56346d5485af07923@linux-foundation.org> User-Agent: s-nail v14.8.16 Sender: owner-linux-mm@kvack.org Precedence: bulk
Series	[001/118] lib/test_bitmap: correct test data offsets for 32-bit \| expand [001/118] lib/test_bitmap: correct test data offsets for 32-bit [002/118] memcg: fix a crash in wb_workfn when a device disappears [003/118] mm/mempolicy.c: fix out of bounds write in mpol_parse_str() [004/118] mm/sparse.c: reset section's mem_map when fully deactivated [005/118] mm/migrate.c: also overwrite error when it is bigger than zero [006/118] mm/memory_hotplug: fix remove_memory() lockdep splat [007/118] mm: thp: don't need care deferred split queue in memcg charge move path [008/118] mm: move_pages: report the number of non-attempted pages [009/118] scripts/spelling.txt: add more spellings to spelling.txt [010/118] scripts/spelling.txt: add "issus" typo [011/118] fs: ocfs: remove unnecessary assertion in dlm_migrate_lockres [012/118] ocfs2: remove unneeded semicolons [013/118] ocfs2: make local header paths relative to C files [014/118] ocfs2/dlm: remove redundant assignment to ret [015/118] ocfs2/dlm: move BITS_TO_BYTES() to bitops.h for wider use [016/118] ocfs2: fix a NULL pointer dereference when call ocfs2_update_inode_fsync_trans() [017/118] ocfs2: use ocfs2_update_inode_fsync_trans() to access t_tid in handle->h_transaction [018/118] mm/slub.c: avoid slub allocation while holding list_lock [019/118] mm/kmemleak: turn kmemleak_lock and object->lock to raw_spinlock_t [020/118] mm/debug.c: always print flags in dump_page() [021/118] mm/filemap.c: clean up filemap_write_and_wait() [022/118] mm: fix gup_pud_range [023/118] mm/gup.c: use is_vm_hugetlb_page() to check whether to follow huge [024/118] mm/gup: factor out duplicate code from four routines [025/118] mm/gup: move try_get_compound_head() to top, fix minor issues [026/118] mm: Cleanup __put_devmap_managed_page() vs ->page_free() [027/118] mm: devmap: refactor 1-based refcounting for ZONE_DEVICE pages [028/118] goldish_pipe: rename local pin_user_pages() routine [029/118] mm: fix get_user_pages_remote()'s handling of FOLL_LONGTERM [030/118] vfio: fix FOLL_LONGTERM use, simplify get_user_pages_remote() call [031/118] mm/gup: allow FOLL_FORCE for get_user_pages_fast() [032/118] IB/umem: use get_user_pages_fast() to pin DMA pages [033/118] media/v4l2-core: set pages dirty upon releasing DMA buffers [034/118] mm/gup: introduce pin_user_pages() and FOLL_PIN [035/118] goldish_pipe: convert to pin_user_pages() and put_user_page() [036/118] IB/{core,hw,umem}: set FOLL_PIN via pin_user_pages(), fix up ODP [037/118] mm/process_vm_access: set FOLL_PIN via pin_user_pages_remote() [038/118] drm/via: set FOLL_PIN via pin_user_pages_fast() [039/118] fs/io_uring: set FOLL_PIN via pin_user_pages() [040/118] net/xdp: set FOLL_PIN via pin_user_pages() [041/118] media/v4l2-core: pin_user_pages (FOLL_PIN) and put_user_page() conversion [042/118] vfio, mm: pin_user_pages (FOLL_PIN) and put_user_page() conversion [043/118] powerpc: book3s64: convert to pin_user_pages() and put_user_page() [044/118] mm/gup_benchmark: use proper FOLL_WRITE flags instead of hard-coding "1" [045/118] mm, tree-wide: rename put_user_page() to unpin_user_page() [046/118] mm/swapfile.c: swap_next should increase position index [047/118] mm/memcontrol.c: cleanup some useless code [048/118] mm/page_vma_mapped.c: explicitly compare pfn for normal, hugetlbfs and THP page [049/118] mm, tracing: print symbol name for kmem_alloc_node call_site events [050/118] lib/test_kasan.c: fix memory leak in kmalloc_oob_krealloc_more() [051/118] mm/early_ioremap.c: use %pa to print resource_size_t variables [052/118] mm/page_alloc: skip non present sections on zone initialization [053/118] mm: remove the memory isolate notifier [054/118] mm: remove "count" parameter from has_unmovable_pages() [055/118] mm/vmscan.c: remove unused return value of shrink_node [056/118] mm/vmscan: remove prefetch_prev_lru_page [057/118] mm/vmscan: remove unused RECLAIM_OFF/RECLAIM_ZONE [058/118] tools/vm/slabinfo: fix sanity checks enabling [059/118] mm/memblock: define memblock_physmem_add() [060/118] memblock: Use __func__ in remaining memblock_dbg() call sites [061/118] mm, oom: dump stack of victim when reaping failed [062/118] mm/huge_memory.c: use head to check huge zero page [063/118] mm/huge_memory.c: use head to emphasize the purpose of page [064/118] mm/huge_memory.c: reduce critical section protected by split_queue_lock [065/118] mm/migrate: remove useless mask of start address [066/118] mm/migrate: clean up some minor coding style [067/118] mm/migrate: add stable check in migrate_vma_insert_page() [068/118] mm, thp: fix defrag setting if newline is not used [069/118] mm/mmap.c: get rid of odd jump labels in find_mergeable_anon_vma() [070/118] mm/memory_hotplug: pass in nid to online_pages() [071/118] mm/hotplug: silence a lockdep splat with printk() [072/118] mm/page_isolation: fix potential warning from user [073/118] mm/zswap.c: add allocation hysteresis if pool limit is hit [074/118] zswap: potential NULL dereference on error in init_zswap() [075/118] include/linux/mm.h: clean up obsolete check on space in page->flags [076/118] include/linux/mm.h: remove dead code totalram_pages_set() [077/118] include/linux/memory.h: drop fields 'hw' and 'phys_callback' from struct memory_block [078/118] mm: fix comments related to node reclaim [079/118] zram: try to avoid worst-case scenario on same element pages [080/118] drivers/block/zram/zram_drv.c: fix error return codes not being returned in writeback_sto… [081/118] include/linux/units.h: add helpers for kelvin to/from Celsius conversion [082/118] ACPI: thermal: switch to use <linux/units.h> helpers [083/118] platform/x86: asus-wmi: switch to use <linux/units.h> helpers [084/118] platform/x86: intel_menlow: switch to use <linux/units.h> helpers [085/118] thermal: int340x: switch to use <linux/units.h> helpers [086/118] thermal: intel_pch: switch to use <linux/units.h> helpers [087/118] nvme: hwmon: switch to use <linux/units.h> helpers [088/118] thermal: remove kelvin to/from Celsius conversion helpers from <linux/thermal.h> [089/118] iwlegacy: use <linux/units.h> helpers [090/118] iwlwifi: use <linux/units.h> helpers [091/118] thermal: armada: remove unused TO_MCELSIUS macro [092/118] iio: adc: qcom-vadc-common: use <linux/units.h> helpers [093/118] lib/zlib: add s390 hardware support for kernel zlib_deflate [094/118] s390/boot: rename HEAP_SIZE due to name collision [095/118] lib/zlib: add s390 hardware support for kernel zlib_inflate [096/118] s390/boot: add dfltcc= kernel command line parameter [097/118] lib/zlib: add zlib_deflate_dfltcc_enabled() function [098/118] btrfs: use larger zlib buffer for s390 hardware compression [099/118] lib/scatterlist.c: adjust indentation in __sg_alloc_table [100/118] uapi: rename ext2_swab() to swab() and share globally in swab.h [101/118] lib/find_bit.c: join _find_next_bit{_le} [102/118] lib/find_bit.c: uninline helper _find_next_bit() [103/118] fs/binfmt_elf.c: smaller code generation around auxv vector fill [104/118] fs/binfmt_elf.c: fix ->start_code calculation [105/118] fs/binfmt_elf.c: don't copy ELF header around [106/118] fs/binfmt_elf.c: better codegen around current->mm [107/118] fs/binfmt_elf.c: make BAD_ADDR() unlikely [108/118] fs/binfmt_elf.c: coredump: allocate core ELF header on stack [109/118] fs/binfmt_elf.c: coredump: delete duplicated overflow check [110/118] fs/binfmt_elf.c: coredump: allow process with empty address space to coredump [111/118] init/main.c: log arguments and environment passed to init [112/118] init/main.c: remove unnecessary repair_env_string in do_initcall_level [113/118] init/main.c: fix quoted value handling in unknown_bootoption [114/118] init/main.c: fix misleading "This architecture does not have kernel memory protection" me… [115/118] reiserfs: prevent NULL pointer dereference in reiserfs_insert_item() [116/118] execve: warn if process starts with executable stack [117/118] include/linux/io-mapping.h-mapping: use PHYS_PFN() macro in io_mapping_map_atomic_wc() [118/118] kcov: ignore fault-inject and stacktrace

Commit Message

Andrew Morton Jan. 31, 2020, 6:17 a.m. UTC

From: Alexey Dobriyan <adobriyan@gmail.com>
Subject: fs/binfmt_elf.c: make BAD_ADDR() unlikely

If some mapping goes past TASK_SIZE it will be rejected by kernel which
means no such userspace binaries exist.

Mark every such check as unlikely.

Link: http://lkml.kernel.org/r/20191215124355.GA21124@avx2
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Reviewed-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 fs/binfmt_elf.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff mbox series

Patch

--- a/fs/binfmt_elf.c~elf-make-bad_addr-unlikely
+++ a/fs/binfmt_elf.c
@@ -97,7 +97,7 @@  static struct linux_binfmt elf_format =
 	.min_coredump	= ELF_EXEC_PAGESIZE,
 };
 
-#define BAD_ADDR(x) ((unsigned long)(x) >= TASK_SIZE)
+#define BAD_ADDR(x) (unlikely((unsigned long)(x) >= TASK_SIZE))
 
 static int set_brk(unsigned long start, unsigned long end, int prot)
 {