From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Kees Cook <keescook@google.com>,
Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Jann Horn <jannh@google.com>,
Alexander Popov <alex.popov@linux.com>,
Tycho Andersen <tycho@tycho.ws>
Subject: linux-next: manual merge of the kspp tree with the tip tree
Date: Fri, 7 Sep 2018 13:05:33 +1000
Message-ID: <20180907130533.03ba3119@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1149 bytes --]
Hi Kees,
Today's linux-next merge of the kspp tree got a conflict in:
drivers/misc/lkdtm/core.c
between commit:
bef459026b16 ("lkdtm: Test copy_to_user() on bad kernel pointer under KERNEL_DS")
from the tip tree and commit:
f90d1e0c7804 ("lkdtm: Add a test for STACKLEAK")
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/core.c
index 5a755590d3dc,aca26d81e9b8..000000000000
--- a/drivers/misc/lkdtm/core.c
+++ b/drivers/misc/lkdtm/core.c
@@@ -183,7 -183,7 +183,8 @@@ static const struct crashtype crashtype
CRASHTYPE(USERCOPY_STACK_FRAME_FROM),
CRASHTYPE(USERCOPY_STACK_BEYOND),
CRASHTYPE(USERCOPY_KERNEL),
+ CRASHTYPE(USERCOPY_KERNEL_DS),
+ CRASHTYPE(STACKLEAK_ERASING),
};
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply index
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-07 3:05 Stephen Rothwell [this message]
2018-10-08 5:44 Stephen Rothwell
2019-11-06 5:03 Stephen Rothwell
2019-11-06 7:28 ` Cyrill Gorcunov
Reply instructions:
You may reply publically to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180907130533.03ba3119@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=alex.popov@linux.com \
--cc=hpa@zytor.com \
--cc=jannh@google.com \
--cc=keescook@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=tycho@tycho.ws \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Linux-Next Archive on lore.kernel.org
Archives are clonable:
git clone --mirror https://lore.kernel.org/linux-next/0 linux-next/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 linux-next linux-next/ https://lore.kernel.org/linux-next \
linux-next@vger.kernel.org
public-inbox-index linux-next
Example config snippet for mirrors
Newsgroup available over NNTP:
nntp://nntp.lore.kernel.org/org.kernel.vger.linux-next
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git