linux-kernel - linux-next: manual merge of the risc-v tree with the risc-v-fixes tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <Zn6_EyxJmwD82JX1@sirena.org.uk>
Date: Fri, 28 Jun 2024 14:48:03 +0100
From: Mark Brown <broonie@...nel.org>
To: Palmer Dabbelt <palmer@...belt.com>, Paul Walmsley <paul@...an.com>
Cc: Alexandre Ghiti <alexghiti@...osinc.com>,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	Linux Next Mailing List <linux-next@...r.kernel.org>,
	Palmer Dabbelt <palmer@...osinc.com>,
	Samuel Holland <samuel.holland@...ive.com>
Subject: linux-next: manual merge of the risc-v tree with the risc-v-fixes
 tree

Hi all,

Today's linux-next merge of the risc-v tree got a conflict in:

  arch/riscv/kernel/patch.c

between commit:

  edf2d546bfd6f ("riscv: patch: Flush the icache right after patching to avoid illegal insns")

from the risc-v-fixes tree and commit:

  47742484ee162 ("riscv: Remove extra variable in patch_text_nosync()")

from the risc-v tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --cc arch/riscv/kernel/patch.c
index ab03732d06c46,5b3f6406e8c44..0000000000000
--- a/arch/riscv/kernel/patch.c
+++ b/arch/riscv/kernel/patch.c
@@@ -200,10 -186,11 +202,9 @@@ NOKPROBE_SYMBOL(patch_insn_set)
  
  int patch_text_set_nosync(void *addr, u8 c, size_t len)
  {
- 	u32 *tp = addr;
  	int ret;
  
- 	ret = patch_insn_set(tp, c, len);
+ 	ret = patch_insn_set(addr, c, len);
 -	if (!ret)
 -		flush_icache_range((uintptr_t)addr, (uintptr_t)addr + len);
  
  	return ret;
  }
@@@ -232,10 -222,11 +236,9 @@@ NOKPROBE_SYMBOL(patch_insn_write)
  
  int patch_text_nosync(void *addr, const void *insns, size_t len)
  {
- 	u32 *tp = addr;
  	int ret;
  
- 	ret = patch_insn_write(tp, insns, len);
+ 	ret = patch_insn_write(addr, insns, len);
 -	if (!ret)
 -		flush_icache_range((uintptr_t)addr, (uintptr_t)addr + len);
  
  	return ret;
  }

Download attachment "signature.asc" of type "application/pgp-signature" (489 bytes)