From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 14 Dec 2022 20:20:00 +0000 (-0800)
Subject: Merge tag 'hardening-v6.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees... 
X-Git-Tag: v6.6.7~3902
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=48ea09cddae0b794cde2070f106ef676703dbcd3;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'hardening-v6.2-rc1' of git://git./linux/kernel/git/kees/linux

Pull kernel hardening updates from Kees Cook:

 - Convert flexible array members, fix -Wstringop-overflow warnings, and
   fix KCFI function type mismatches that went ignored by maintainers
   (Gustavo A. R. Silva, Nathan Chancellor, Kees Cook)

 - Remove the remaining side-effect users of ksize() by converting
   dma-buf, btrfs, and coredump to using kmalloc_size_roundup(), add
   more __alloc_size attributes, and introduce full testing of all
   allocator functions. Finally remove the ksize() side-effect so that
   each allocation-aware checker can finally behave without exceptions

 - Introduce oops_limit (default 10,000) and warn_limit (default off) to
   provide greater granularity of control for panic_on_oops and
   panic_on_warn (Jann Horn, Kees Cook)

 - Introduce overflows_type() and castable_to_type() helpers for cleaner
   overflow checking

 - Improve code generation for strscpy() and update str*() kern-doc

 - Convert strscpy and sigphash tests to KUnit, and expand memcpy tests

 - Always use a non-NULL argument for prepare_kernel_cred()

 - Disable structleak plugin in FORTIFY KUnit test (Anders Roxell)

 - Adjust orphan linker section checking to respect CONFIG_WERROR (Xin
   Li)

 - Make sure siginfo is cleared for forced SIGKILL (haifeng.xu)

 - Fix um vs FORTIFY warnings for always-NULL arguments

* tag 'hardening-v6.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux: (31 commits)
  ksmbd: replace one-element arrays with flexible-array members
  hpet: Replace one-element array with flexible-array member
  um: virt-pci: Avoid GCC non-NULL warning
  signal: Initialize the info in ksignal
  lib: fortify_kunit: build without structleak plugin
  panic: Expose "warn_count" to sysfs
  panic: Introduce warn_limit
  panic: Consolidate open-coded panic_on_warn checks
  exit: Allow oops_limit to be disabled
  exit: Expose "oops_count" to sysfs
  exit: Put an upper limit on how often we can oops
  panic: Separate sysctl logic from CONFIG_SMP
  mm/pgtable: Fix multiple -Wstringop-overflow warnings
  mm: Make ksize() a reporting-only function
  kunit/fortify: Validate __alloc_size attribute results
  drm/sti: Fix return type of sti_{dvo,hda,hdmi}_connector_mode_valid()
  drm/fsl-dcu: Fix return type of fsl_dcu_drm_connector_mode_valid()
  driver core: Add __alloc_size hint to devm allocators
  overflow: Introduce overflows_type() and castable_to_type()
  coredump: Proactively round up to kmalloc bucket size
  ...
---

48ea09cddae0b794cde2070f106ef676703dbcd3
diff --cc lib/Makefile
index 59bd7c2,83c650b..4d9461b
--- a/lib/Makefile
+++ b/lib/Makefile
@@@ -82,10 -81,8 +81,9 @@@ obj-$(CONFIG_TEST_DYNAMIC_DEBUG) += tes
  obj-$(CONFIG_TEST_PRINTF) += test_printf.o
  obj-$(CONFIG_TEST_SCANF) += test_scanf.o
  obj-$(CONFIG_TEST_BITMAP) += test_bitmap.o
- obj-$(CONFIG_TEST_STRSCPY) += test_strscpy.o
  obj-$(CONFIG_TEST_UUID) += test_uuid.o
  obj-$(CONFIG_TEST_XARRAY) += test_xarray.o
 +obj-$(CONFIG_TEST_MAPLE_TREE) += test_maple_tree.o
  obj-$(CONFIG_TEST_PARMAN) += test_parman.o
  obj-$(CONFIG_TEST_KMOD) += test_kmod.o
  obj-$(CONFIG_TEST_DEBUG_VIRTUAL) += test_debug_virtual.o
diff --cc mm/slab_common.c
index 3e49bb8,7e96abf..1cba98a
--- a/mm/slab_common.c
+++ b/mm/slab_common.c
@@@ -1426,15 -1413,27 +1428,13 @@@ void kfree_sensitive(const void *p
  }
  EXPORT_SYMBOL(kfree_sensitive);
  
 -/**
 - * ksize - get the actual amount of memory allocated for a given object
 - * @objp: Pointer to the object
 - *
 - * kmalloc may internally round up allocations and return more memory
 - * than requested. ksize() can be used to determine the actual amount of
 - * memory allocated. The caller may use this additional memory, even though
 - * a smaller amount of memory was initially specified with the kmalloc call.
 - * The caller must guarantee that objp points to a valid object previously
 - * allocated with either kmalloc() or kmem_cache_alloc(). The object
 - * must not be freed during the duration of the call.
 - *
 - * Return: size of the actual memory used by @objp in bytes
 - */
  size_t ksize(const void *objp)
  {
- 	size_t size;
- 
  	/*
- 	 * We need to first check that the pointer to the object is valid, and
- 	 * only then unpoison the memory. The report printed from ksize() is
- 	 * more useful, then when it's printed later when the behaviour could
- 	 * be undefined due to a potential use-after-free or double-free.
+ 	 * We need to first check that the pointer to the object is valid.
+ 	 * The KASAN report printed from ksize() is more useful, then when
+ 	 * it's printed later when the behaviour could be undefined due to
+ 	 * a potential use-after-free or double-free.
  	 *
  	 * We use kasan_check_byte(), which is supported for the hardware
  	 * tag-based KASAN mode, unlike kasan_check_read/write().