On Thu, May 05, 2022 at 05:20:10PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the kspp tree got a conflict in:
>
> drivers/misc/lkdtm/stackleak.c
>
> between commit:
>
> 73f62e60d80c ("lkdtm: Move crashtype definitions into each category")
>
> from the char-misc tree and commit:
>
> c393c0b98d75 ("lkdtm/stackleak: prevent unexpected stack usage")
>
> from the kspp 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 drivers/misc/lkdtm/stackleak.c
> index 210c84dfe1d2,52800583fd05..000000000000
> --- a/drivers/misc/lkdtm/stackleak.c
> +++ b/drivers/misc/lkdtm/stackleak.c
> @@@ -81,11 -115,11 +115,20 @@@ out
> }
> }
>
> -void lkdtm_STACKLEAK_ERASING(void)
> ++static void lkdtm_STACKLEAK_ERASING(void)
> + {
> + unsigned long flags;
> +
> + local_irq_save(flags);
> + check_stackleak_irqoff();
> + local_irq_restore(flags);
> + }
> ++
> +static struct crashtype crashtypes[] = {
> + CRASHTYPE(STACKLEAK_ERASING),
> +};
> +
> +struct crashtype_category stackleak_crashtypes = {
> + .crashtypes = crashtypes,
> + .len = ARRAY_SIZE(crashtypes),
> +};
Thanks! This looks correct to me.
--
Kees Cook
