Commit dc164f4f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus-6.0-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux 

Pull UML fixes from Richard Weinberger:

 - Various fixes for build warnings

 - Fix default kernel command line

* tag 'for-linus-6.0-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux:
  arch: um: Mark the stack non-executable to fix a binutils warning
  um: Prevent KASAN splats in dump_stack()
  um: fix default console kernel parameter
  um: Cleanup compiler warning in arch/x86/um/tls_32.c
  um: Cleanup syscall_handler_t cast in syscalls_32.h
parents 26c95642 bd71558d

arch/um/Makefile

+8 −0
Original line number Diff line number Diff line
@@ -132,10 +132,18 @@ export LDS_ELF_FORMAT := $(ELF_FORMAT) 
# The wrappers will select whether using "malloc" or the kernel allocator.

LINK_WRAPS = -Wl,--wrap,malloc -Wl,--wrap,free -Wl,--wrap,calloc



# Avoid binutils 2.39+ warnings by marking the stack non-executable and

# ignorning warnings for the kallsyms sections.

LDFLAGS_EXECSTACK = -z noexecstack

ifeq ($(CONFIG_LD_IS_BFD),y)

LDFLAGS_EXECSTACK += $(call ld-option,--no-warn-rwx-segments)

endif



LD_FLAGS_CMDLINE = $(foreach opt,$(KBUILD_LDFLAGS),-Wl,$(opt))



# Used by link-vmlinux.sh which has special support for um link

export CFLAGS_vmlinux := $(LINK-y) $(LINK_WRAPS) $(LD_FLAGS_CMDLINE)

export LDFLAGS_vmlinux := $(LDFLAGS_EXECSTACK)



# When cleaning we don't include .config, so we don't include

# TT or skas makefiles and don't clean skas_ptregs.h.

arch/um/kernel/sysrq.c

+2 −1
Original line number Diff line number Diff line
@@ -48,7 +48,8 @@ void show_stack(struct task_struct *task, unsigned long *stack, 
			break;

		if (i && ((i % STACKSLOTS_PER_LINE) == 0))

			pr_cont("\n");

		pr_cont(" %08lx", *stack++);

		pr_cont(" %08lx", READ_ONCE_NOCHECK(*stack));

		stack++;

	}



	printk("%sCall Trace:\n", loglvl);

arch/um/kernel/um_arch.c

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
#include "um_arch.h"



#define DEFAULT_COMMAND_LINE_ROOT "root=98:0"

#define DEFAULT_COMMAND_LINE_CONSOLE "console=tty"

#define DEFAULT_COMMAND_LINE_CONSOLE "console=tty0"



/* Changed in add_arg and setup_arch, which run before SMP is started */

static char __initdata command_line[COMMAND_LINE_SIZE] = { 0 };

arch/x86/um/shared/sysdep/syscalls_32.h

+2 −3
Original line number Diff line number Diff line
@@ -6,10 +6,9 @@ 
#include <asm/unistd.h>

#include <sysdep/ptrace.h>



typedef long syscall_handler_t(struct pt_regs);

typedef long syscall_handler_t(struct syscall_args);



extern syscall_handler_t *sys_call_table[];



#define EXECUTE_SYSCALL(syscall, regs) \

	((long (*)(struct syscall_args)) \

	 (*sys_call_table[syscall]))(SYSCALL_ARGS(&regs->regs))
 
	((*sys_call_table[syscall]))(SYSCALL_ARGS(&regs->regs))

arch/x86/um/tls_32.c

+0 −6
Original line number Diff line number Diff line
@@ -65,9 +65,6 @@ static int get_free_idx(struct task_struct* task) 
	struct thread_struct *t = &task->thread;

	int idx;



	if (!t->arch.tls_array)

		return GDT_ENTRY_TLS_MIN;



	for (idx = 0; idx < GDT_ENTRY_TLS_ENTRIES; idx++)

		if (!t->arch.tls_array[idx].present)

			return idx + GDT_ENTRY_TLS_MIN;
@@ -240,9 +237,6 @@ static int get_tls_entry(struct task_struct *task, struct user_desc *info, 
{

	struct thread_struct *t = &task->thread;



	if (!t->arch.tls_array)

		goto clear;



	if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX)

		return -EINVAL;