Commit 2254005e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'parisc-for-6.7-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux 

Pull parisc fixes from Helge Deller:
 "On parisc we still sometimes need writeable stacks, e.g. if programs
  aren't compiled with gcc-14. To avoid issues with the upcoming
  systemd-254 we therefore have to disable prctl(PR_SET_MDWE) for now
  (for parisc only).

  The other two patches are minor: a bugfix for the soft power-off on
  qemu with 64-bit kernel and prefer strscpy() over strlcpy():

   - Fix power soft-off on qemu

   - Disable prctl(PR_SET_MDWE) since parisc sometimes still needs
     writeable stacks

   - Use strscpy instead of strlcpy in show_cpuinfo()"

* tag 'parisc-for-6.7-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  prctl: Disable prctl(PR_SET_MDWE) on parisc
  parisc/power: Fix power soft-off when running on qemu
  parisc: Replace strlcpy() with strscpy()
parents b8f1fa24 79383813

arch/parisc/kernel/processor.c

+1 −1
Original line number Diff line number Diff line
@@ -383,7 +383,7 @@ show_cpuinfo (struct seq_file *m, void *v) 
	char cpu_name[60], *p;



	/* strip PA path from CPU name to not confuse lscpu */

	strlcpy(cpu_name, per_cpu(cpu_data, 0).dev->name, sizeof(cpu_name));

	strscpy(cpu_name, per_cpu(cpu_data, 0).dev->name, sizeof(cpu_name));

	p = strrchr(cpu_name, '[');

	if (p)

		*(--p) = 0;

drivers/parisc/power.c

+1 −1
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ static struct notifier_block parisc_panic_block = { 
static int qemu_power_off(struct sys_off_data *data)

{

	/* this turns the system off via SeaBIOS */

	*(int *)data->cb_data = 0;

	gsc_writel(0, (unsigned long) data->cb_data);

	pdc_soft_power_button(1);

	return NOTIFY_DONE;

}

kernel/sys.c

+4 −0
Original line number Diff line number Diff line
@@ -2394,6 +2394,10 @@ static inline int prctl_set_mdwe(unsigned long bits, unsigned long arg3, 
	if (bits & PR_MDWE_NO_INHERIT && !(bits & PR_MDWE_REFUSE_EXEC_GAIN))

		return -EINVAL;



	/* PARISC cannot allow mdwe as it needs writable stacks */

	if (IS_ENABLED(CONFIG_PARISC))

		return -EINVAL;



	current_bits = get_current_mdwe();

	if (current_bits && current_bits != bits)

		return -EPERM; /* Cannot unset the flags */