From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754474AbbIHJwl (ORCPT ); Tue, 8 Sep 2015 05:52:41 -0400 Received: from szxga01-in.huawei.com ([58.251.152.64]:10656 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751743AbbIHJwj (ORCPT ); Tue, 8 Sep 2015 05:52:39 -0400 Message-ID: <55EEAFD7.8010409@huawei.com> Date: Tue, 8 Sep 2015 17:52:23 +0800 From: Xishi Qiu User-Agent: Mozilla/5.0 (Windows NT 6.1; rv:12.0) Gecko/20120428 Thunderbird/12.0.1 MIME-Version: 1.0 To: Andrey Ryabinin CC: Andrew Morton , Andrey Konovalov , Rusty Russell , Michal Marek , Linux MM , LKML , Subject: Re: [PATCH] kasan: fix last shadow judgement in memory_is_poisoned_16() References: <55EE3D03.8000502@huawei.com> <55EEAF37.5050402@huawei.com> In-Reply-To: <55EEAF37.5050402@huawei.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.177.25.179] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2015/9/8 17:49, Xishi Qiu wrote: > On 2015/9/8 17:36, Andrey Ryabinin wrote: > >> 2015-09-08 4:42 GMT+03:00 Xishi Qiu : >>> The shadow which correspond 16 bytes may span 2 or 3 bytes. If shadow >>> only take 2 bytes, we can return in "if (likely(!last_byte)) ...", but >>> it calculates wrong, so fix it. >>> >> >> Please, be more specific. Describe what is wrong with the current code and why, >> what's the effect of this bug and how you fixed it. >> >> > > If the 16 bytes memory is aligned on 8, then the shadow takes only 2 bytes. > So we check "shadow_first_bytes" is enough, and need not to call "memory_is_poisoned_1(addr + 15);". > The code "if (likely(IS_ALIGNED(addr, 8)))" is wrong judgement. Sorry, a mistake, The code "if (likely(!last_byte))" is wrong judgement. > e.g. addr=0, so last_byte = 15 & KASAN_SHADOW_MASK = 7, then the code will > continue to call "return memory_is_poisoned_1(addr + 15);" > > Thanks, > Xishi Qiu > >>> Signed-off-by: Xishi Qiu >>> --- >>> mm/kasan/kasan.c | 3 +-- >>> 1 files changed, 1 insertions(+), 2 deletions(-) >>> >>> diff --git a/mm/kasan/kasan.c b/mm/kasan/kasan.c >>> index 7b28e9c..8da2114 100644 >>> --- a/mm/kasan/kasan.c >>> +++ b/mm/kasan/kasan.c >>> @@ -135,12 +135,11 @@ static __always_inline bool memory_is_poisoned_16(unsigned long addr) >>> >>> if (unlikely(*shadow_addr)) { >>> u16 shadow_first_bytes = *(u16 *)shadow_addr; >>> - s8 last_byte = (addr + 15) & KASAN_SHADOW_MASK; >>> >>> if (unlikely(shadow_first_bytes)) >>> return true; >>> >>> - if (likely(!last_byte)) >>> + if (likely(IS_ALIGNED(addr, 8))) >>> return false; >>> >>> return memory_is_poisoned_1(addr + 15); >>> -- >>> 1.7.1 >>> >>> >> >> . >> > >