linux-kernel - linux-next: manual merge of the csky tree with Linus' 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: <20220404081455.1539a4c2@canb.auug.org.au>
Date:   Mon, 4 Apr 2022 08:14:55 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Guo Ren <ren_guo@...ky.com>
Cc:     Guo Ren <guoren@...nel.org>, Guo Ren <guoren@...ux.alibaba.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Palmer Dabbelt <palmer@...osinc.com>,
        Vincent Chen <vincent.chen@...ive.com>
Subject: linux-next: manual merge of the csky tree with Linus' tree

Hi all,

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

  arch/riscv/kernel/signal.c

between commit:

  93917ad50972 ("RISC-V: Add support for restartable sequence")

from Linus' tree and commit:

  0f713062b0ee ("riscv: compat: signal: Add rt_frame implementation")

from the csky 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.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/riscv/kernel/signal.c
index 9f4e59f80551,27d8f39228c4..000000000000
--- a/arch/riscv/kernel/signal.c
+++ b/arch/riscv/kernel/signal.c
@@@ -258,10 -264,13 +264,15 @@@ static void handle_signal(struct ksigna
  		}
  	}
  
 +	rseq_signal_deliver(ksig, regs);
 +
+ #ifdef CONFIG_COMPAT
  	/* Set up the stack frame */
- 	ret = setup_rt_frame(ksig, oldset, regs);
+ 	if (is_compat_task())
+ 		ret = compat_setup_rt_frame(ksig, oldset, regs);
+ 	else
+ #endif
+ 		ret = setup_rt_frame(ksig, oldset, regs);
  
  	signal_setup_done(ret, ksig, 0);
  }

Content of type "application/pgp-signature" skipped