Commit 727dbda1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'hardening-v6.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux 

Pull hardening updates from Kees Cook:
 "As has become normal, changes are scattered around the tree (either
  explicitly maintainer Acked or for trivial stuff that went ignored):

   - Carve out the new CONFIG_LIST_HARDENED as a more focused subset of
     CONFIG_DEBUG_LIST (Marco Elver)

   - Fix kallsyms lookup failure under Clang LTO (Yonghong Song)

   - Clarify documentation for CONFIG_UBSAN_TRAP (Jann Horn)

   - Flexible array member conversion not carried in other tree (Gustavo
     A. R. Silva)

   - Various strlcpy() and strncpy() removals not carried in other trees
     (Azeem Shaikh, Justin Stitt)

   - Convert nsproxy.count to refcount_t (Elena Reshetova)

   - Add handful of __counted_by annotations not carried in other trees,
     as well as an LKDTM test

   - Fix build failure with gcc-plugins on GCC 14+

   - Fix selftests to respect SKIP for signal-delivery tests

   - Fix CFI warning for paravirt callback prototype

   - Clarify documentation for seq_show_option_n() usage"

* tag 'hardening-v6.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux: (23 commits)
  LoadPin: Annotate struct dm_verity_loadpin_trusted_root_digest with __counted_by
  kallsyms: Change func signature for cleanup_symbol_name()
  kallsyms: Fix kallsyms_selftest failure
  nsproxy: Convert nsproxy.count to refcount_t
  integrity: Annotate struct ima_rule_opt_list with __counted_by
  lkdtm: Add FAM_BOUNDS test for __counted_by
  Compiler Attributes: counted_by: Adjust name and identifier expansion
  um: refactor deprecated strncpy to memcpy
  um: vector: refactor deprecated strncpy
  alpha: Replace one-element array with flexible-array member
  hardening: Move BUG_ON_DATA_CORRUPTION to hardening options
  list: Introduce CONFIG_LIST_HARDENED
  list_debug: Introduce inline wrappers for debug checks
  compiler_types: Introduce the Clang __preserve_most function attribute
  gcc-plugins: Rename last_stmt() for GCC 14+
  selftests/harness: Actually report SKIP for signal tests
  x86/paravirt: Fix tlb_remove_table function callback prototype warning
  EISA: Replace all non-returning strlcpy with strscpy
  perf: Replace strlcpy with strscpy
  um: Remove strlcpy declaration
  ...
parents b03a4342 5f536ac6

arch/alpha/kernel/osf_sys.c

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ struct osf_dirent { 
	unsigned int d_ino;

	unsigned short d_reclen;

	unsigned short d_namlen;

	char d_name[1];

	char d_name[];

};



struct osf_dirent_callback {

arch/arm64/kvm/hyp/nvhe/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ hyp-obj-y := timer-sr.o sysreg-sr.o debug-sr.o switch.o tlb.o hyp-init.o host.o 
	 cache.o setup.o mm.o mem_protect.o sys_regs.o pkvm.o stacktrace.o ffa.o

hyp-obj-y += ../vgic-v3-sr.o ../aarch32.o ../vgic-v2-cpuif-proxy.o ../entry.o \

	 ../fpsimd.o ../hyp-entry.o ../exception.o ../pgtable.o

hyp-obj-$(CONFIG_DEBUG_LIST) += list_debug.o

hyp-obj-$(CONFIG_LIST_HARDENED) += list_debug.o

hyp-obj-y += $(lib-objs)



##

arch/arm64/kvm/hyp/nvhe/list_debug.c

+5 −3
Original line number Diff line number Diff line
@@ -26,7 +26,8 @@ static inline __must_check bool nvhe_check_data_corruption(bool v) 


/* The predicates checked here are taken from lib/list_debug.c. */



bool __list_add_valid(struct list_head *new, struct list_head *prev,

__list_valid_slowpath

bool __list_add_valid_or_report(struct list_head *new, struct list_head *prev,

				struct list_head *next)

{

	if (NVHE_CHECK_DATA_CORRUPTION(next->prev != prev) ||
@@ -37,7 +38,8 @@ bool __list_add_valid(struct list_head *new, struct list_head *prev, 
	return true;

}



bool __list_del_entry_valid(struct list_head *entry)

__list_valid_slowpath

bool __list_del_entry_valid_or_report(struct list_head *entry)

{

	struct list_head *prev, *next;

arch/um/drivers/mconsole_kern.c

+2 −2
Original line number Diff line number Diff line
@@ -554,7 +554,7 @@ struct mconsole_output { 


static DEFINE_SPINLOCK(client_lock);

static LIST_HEAD(clients);

static char console_buf[MCONSOLE_MAX_DATA];

static char console_buf[MCONSOLE_MAX_DATA] __nonstring;



static void console_write(struct console *console, const char *string,

			  unsigned int len)
@@ -567,7 +567,7 @@ static void console_write(struct console *console, const char *string, 


	while (len > 0) {

		n = min((size_t) len, ARRAY_SIZE(console_buf));

		strncpy(console_buf, string, n);

		memcpy(console_buf, string, n);

		string += n;

		len -= n;

arch/um/drivers/vector_user.c

+2 −2
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ static int create_tap_fd(char *iface) 
	}

	memset(&ifr, 0, sizeof(ifr));

	ifr.ifr_flags = IFF_TAP | IFF_NO_PI | IFF_VNET_HDR;

	strncpy((char *)&ifr.ifr_name, iface, sizeof(ifr.ifr_name) - 1);

	strscpy(ifr.ifr_name, iface, sizeof(ifr.ifr_name));



	err = ioctl(fd, TUNSETIFF, (void *) &ifr);

	if (err != 0) {
@@ -171,7 +171,7 @@ static int create_raw_fd(char *iface, int flags, int proto) 
		goto raw_fd_cleanup;

	}

	memset(&ifr, 0, sizeof(ifr));

	strncpy((char *)&ifr.ifr_name, iface, sizeof(ifr.ifr_name) - 1);

	strscpy(ifr.ifr_name, iface, sizeof(ifr.ifr_name));

	if (ioctl(fd, SIOCGIFINDEX, (void *) &ifr) < 0) {

		err = -errno;

		goto raw_fd_cleanup;