Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966044AbcDMLUc (ORCPT ); Wed, 13 Apr 2016 07:20:32 -0400 Received: from mail-wm0-f44.google.com ([74.125.82.44]:35051 "EHLO mail-wm0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932793AbcDMLUb (ORCPT ); Wed, 13 Apr 2016 07:20:31 -0400 From: Alexander Potapenko To: adech.fo@gmail.com, dvyukov@google.com, cl@linux.com, akpm@linux-foundation.org, ryabinin.a.a@gmail.com, kcc@google.com Cc: kasan-dev@googlegroups.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH v2 1/2] mm, kasan: don't call kasan_krealloc() from ksize(). Date: Wed, 13 Apr 2016 13:20:09 +0200 Message-Id: <2126fe9ca8c3a4698c0ad7aae652dce28e261182.1460545373.git.glider@google.com> X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1190 Lines: 42 Instead of calling kasan_krealloc(), which replaces the memory allocation stack ID (if stack depot is used), just unpoison the whole memory chunk. Signed-off-by: Alexander Potapenko --- v2: - splitted v1 into two patches --- mm/slab.c | 2 +- mm/slub.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/mm/slab.c b/mm/slab.c index 17e2848..de46319 100644 --- a/mm/slab.c +++ b/mm/slab.c @@ -4324,7 +4324,7 @@ size_t ksize(const void *objp) /* We assume that ksize callers could use the whole allocated area, * so we need to unpoison this area. */ - kasan_krealloc(objp, size, GFP_NOWAIT); + kasan_unpoison_shadow(objp, size); return size; } diff --git a/mm/slub.c b/mm/slub.c index 4dbb109e..62194e2 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -3635,8 +3635,9 @@ size_t ksize(const void *object) { size_t size = __ksize(object); /* We assume that ksize callers could use whole allocated area, - so we need unpoison this area. */ - kasan_krealloc(object, size, GFP_NOWAIT); + * so we need to unpoison this area. + */ + kasan_unpoison_shadow(object, size); return size; } EXPORT_SYMBOL(ksize); -- 2.8.0.rc3.226.g39d4020