From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1751576AbcGRFON (ORCPT <rfc822;w@1wt.eu>);
	Mon, 18 Jul 2016 01:14:13 -0400
Received: from mail-wm0-f50.google.com ([74.125.82.50]:36474 "EHLO
	mail-wm0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1750857AbcGRFOJ (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Mon, 18 Jul 2016 01:14:09 -0400
MIME-Version: 1.0
In-Reply-To: <20160718150602.1c8f1896@canb.auug.org.au>
References: <20160718125944.19ebe679@canb.auug.org.au> <CAGXu5jL-=N8cxoLmfNhG-1Pa864MQBbue1SyBQo-HsuOH41_nQ@mail.gmail.com>
 <20160718150602.1c8f1896@canb.auug.org.au>
From: Kees Cook <keescook@google.com>
Date: Sun, 17 Jul 2016 22:14:06 -0700
Message-ID: <CAGXu5jLxOeJqjGuumGQ-dsAbM+NUR6m=o5OASJKSMGLGfM68OQ@mail.gmail.com>
Subject: Re: linux-next: manual merge of the kspp tree with the arm64 tree
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Catalin Marinas <catalin.marinas@arm.com>,
        Linux-Next <linux-next@vger.kernel.org>,
        LKML <linux-kernel@vger.kernel.org>, Yang Shi <yang.shi@linaro.org>
Content-Type: text/plain; charset=UTF-8
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Sun, Jul 17, 2016 at 10:06 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Kees,
>
> On Sun, 17 Jul 2016 21:49:40 -0700 Kees Cook <keescook@google.com> 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 "return" and "__arch_copy..." in both
>> chunks and add check_object_size() calls after the kasan calls in both
>> chunks.
>
> Yep, sorry.  I will fix it up tomorrow.

Cool, thanks! :)

-Kees

-- 
Kees Cook
Brillo & Chrome OS Security