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 S1751659AbcGRFGI (ORCPT <rfc822;w@1wt.eu>);
	Mon, 18 Jul 2016 01:06:08 -0400
Received: from ozlabs.org ([103.22.144.67]:35734 "EHLO ozlabs.org"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1751451AbcGRFGF (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Mon, 18 Jul 2016 01:06:05 -0400
Date: Mon, 18 Jul 2016 15:06:02 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Kees Cook <keescook@google.com>
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>
Subject: Re: linux-next: manual merge of the kspp tree with the arm64 tree
Message-ID: <20160718150602.1c8f1896@canb.auug.org.au>
In-Reply-To: <CAGXu5jL-=N8cxoLmfNhG-1Pa864MQBbue1SyBQo-HsuOH41_nQ@mail.gmail.com>
References: <20160718125944.19ebe679@canb.auug.org.au>
	<CAGXu5jL-=N8cxoLmfNhG-1Pa864MQBbue1SyBQo-HsuOH41_nQ@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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.

-- 
Cheers,
Stephen Rothwell