linux-next: manual merge of the kspp tree with the arm64 tree

2016-07-20 Thread Stephen Rothwell
Hi Kees, Today's linux-next merge of the kspp tree got a conflict in: arch/arm64/include/asm/uaccess.h between commit: bffe1baff5d5 ("arm64: kasan: instrument user memory access API") from the arm64 tree and commit: aac380fe78b1 ("arm64/uaccess: Enable hardened usercopy") from the kspp

Re: linux-next: manual merge of the kspp tree with the arm64 tree

2016-07-17 Thread Kees Cook
On Sun, Jul 17, 2016 at 10:06 PM, Stephen Rothwell wrote: > Hi Kees, > > On Sun, 17 Jul 2016 21:49:40 -0700 Kees Cook wrote: >> >> If I'm reading correctly, this second fixup is wrong. It should read; >> >> kasan_check_read(from, n); >> check_object_size(from, n, true); >> return __a

Re: linux-next: manual merge of the kspp tree with the arm64 tree

2016-07-17 Thread Stephen Rothwell
Hi Kees, On Sun, 17 Jul 2016 21:49:40 -0700 Kees Cook wrote: > > If I'm reading correctly, this second fixup is wrong. It should read; > > kasan_check_read(from, n); > check_object_size(from, n, true); > return __arch_copy_to_user(to, from, n); > > (i.e. fix double space between "re

Re: linux-next: manual merge of the kspp tree with the arm64 tree

2016-07-17 Thread Kees Cook
On Sun, Jul 17, 2016 at 7:59 PM, Stephen Rothwell wrote: > Hi Kees, > > Today's linux-next merge of the kspp tree got a conflict in: > > arch/arm64/include/asm/uaccess.h > > between commit: > > bffe1baff5d5 ("arm64: kasan: instrument user memory access API") > > from the arm64 tree and commit:

linux-next: manual merge of the kspp tree with the arm64 tree

2016-07-17 Thread Stephen Rothwell
Hi Kees, Today's linux-next merge of the kspp tree got a conflict in: arch/arm64/include/asm/uaccess.h between commit: bffe1baff5d5 ("arm64: kasan: instrument user memory access API") from the arm64 tree and commit: b19e7f50f056 ("arm64/uaccess: Enable hardened usercopy") from the kspp