From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-lj1-f180.google.com (mail-lj1-f180.google.com [209.85.208.180]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 98F15182D2 for ; Tue, 13 Jan 2026 19:16:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.180 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768331764; cv=none; b=PaS8Y9AtorUgY32Ej1HnoF2fsjmcAOzIViasjIvnr3bf0Gj/RhEfK0U5eK2RR+mWm2aAOccR2oerhMqkgKAh/Hy9zBwkawOXj08enRVt6tKylAR12I8P3TnwIHFc7X/t3KhhOJ6hBYTt1TGKKFLVuWU2Xrzx91dFpRHOXEnbh98= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768331764; c=relaxed/simple; bh=Z5urRHLHK7nLUana3bPqam/CMrPaNzlqkPx1+GvkixM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=iW30RAuBy318WVrlY+XzPrqSYL2w52RtAG//USSXS+fn9FG+c0n6W4Q/9QOvHYGMUPKeu9gZ/PHwR20xjbdDX36hjMWCOR7099NLuhKUT3zmAYDWpJLyitTUk7sr7N9wMmU+InWnz+4aza/N6g+d5K6Ghapycts9gc9Dwd5kRH8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=U9I1sV5q; arc=none smtp.client-ip=209.85.208.180 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="U9I1sV5q" Received: by mail-lj1-f180.google.com with SMTP id 38308e7fff4ca-3831b6abed6so5397851fa.1 for ; Tue, 13 Jan 2026 11:16:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1768331761; x=1768936561; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=kNWxc7urAc+WPUb7dtJ1KQJNNzOu7ZjngdMJAMiDVCE=; b=U9I1sV5qTsEO7dADG3acuoYUup2uwKdSiXBHrtAWFHyo7QUfAkAxoeqMMbDk8uZBQ4 +JBkB59hZ3gh7dfMrg7xmIexRV0utaInGglhJG1fz+gztTZGu2kd2jQEM0yePrQwtuiI 1BWzQbJqWco+IttK4jVTGYj0lnBLFt+KhoXhbeWOg8fSjz/mdCpp0i+CD1z81/RUEESj x1WOecDuQsp8zN7M1UyDWgCuizCx2BJrmm36PoXlLtmdLyiUl+418wJh2UW1xZAsxFfa tkYW+gHoOgJN9L7uNvqXaCxKXd9/qsurlsJt/mSOoNn893C5oJEgP8VT7KUeZIE5EQOc yCYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768331761; x=1768936561; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=kNWxc7urAc+WPUb7dtJ1KQJNNzOu7ZjngdMJAMiDVCE=; b=oCQfWUTxEPugjlWaX31QhwPKBLvZXq56PYQ1kqx/9PZFvG5ZdAAjUPB5uhZHRVAHVE VXFXJ7u0CU5uEotTuCxaUWPztf29lgz/YNTP6ZCwmILgHBg7NelB2zg2DZeSyYo3bsX0 x/IM8DkcAGsC39bo8KibPx5NMUtcVSUJzSXfO/QKvcBKS+HMed72cvWeqcmOCxMVR+Lm J5TjB288APKvvMCwXzD5usRIpmV7PHcr7i8psI6XGbHa5KdQzLJfs0tWNP6AQEo3lKLT 2g+cJ/zmswpgVNlupOT7oig5rc9w4K2jlESKf6kvoeOmxY4FKDKd1M73LF1PesobetlZ 6KUw== X-Forwarded-Encrypted: i=1; AJvYcCV5OcCkSCin6VVkhB4XYWPf95+kGmyvzcZf5ZjMc68JW92Eh+4h5yMiLxfNF46+WERg4kcOvUnmH7ScW4c=@vger.kernel.org X-Gm-Message-State: AOJu0Ywpi8lwq1FOAmAsAby4XoH0l5CSDMkklM0Rzdi1idYrXDEw3IXR 7yzwfsbKUKU5KTV8FjojQIhG98MHkGMre7eMfqCFkduN3C9p5imHQyfh X-Gm-Gg: AY/fxX7Nj0KlAQIxmUdf9mlrwexaxX/lay2plsOmOyV5vBXRG5cB9l4zQGMCQEDTi7/ Cbbp+Cw3csvVE2hyaCI+9lRAIMCSE+v5lqOaOl0qiVdjTKaXYMj26wB690TuTtnQjxdo7AzZ5Kj lonSlYYNCdAmHDxsFNCmrRKMLkkOsxFKOWJr9en+psBCbWB2ot4ijc+aDzoRFYcE+/d4lqKJ7HA 8HWLqjbpRSnvLegy/11hyzA0ooD2B2v2OO58Cuox9wHn55mD1T7rC/OOAN/wTxrkQ+Gq+j5TGCp JsfUj+xQJLRAmCkUK0s7WG8ZBErHcZExdYhCUoEquuQu9a49RZPKOOPPOPFWyYss2Q/WHXQI3ja ikGX5FGGgTAZCIAGXWgUBg/0n/UZGvbJbbmG/3vECpFrthmR23trpbVpHY4qOJ+isGIBC8loEg3 Z54Eoo9kGra4uKEHwDY9wMcgBbwdOoA0atTg== X-Google-Smtp-Source: AGHT+IEWr6drC+zpyxpYdRsl+WTpwPbMxB4PxC6CXmyNXqXAc6ksEPPqWnLy4U69o0ywwEWEZ9DZXw== X-Received: by 2002:a05:6512:3b25:b0:59b:7291:9cd8 with SMTP id 2adb3069b0e04-59b72919e55mr4212248e87.7.1768331760373; Tue, 13 Jan 2026 11:16:00 -0800 (PST) Received: from dellarbn.yandex.net ([80.93.240.68]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-59b6a97e94csm5568773e87.91.2026.01.13.11.15.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Jan 2026 11:15:59 -0800 (PST) From: Andrey Ryabinin To: Andrew Morton Cc: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= , Maciej Wieczor-Retman , Alexander Potapenko , Andrey Konovalov , Dmitry Vyukov , Vincenzo Frascino , kasan-dev@googlegroups.com, Uladzislau Rezki , linux-kernel@vger.kernel.org, linux-mm@kvack.org, Andrey Ryabinin , joonki.min@samsung-slsi.corp-partner.google.com, stable@vger.kernel.org Subject: [PATCH 1/2] mm/kasan: Fix KASAN poisoning in vrealloc() Date: Tue, 13 Jan 2026 20:15:15 +0100 Message-ID: <20260113191516.31015-1-ryabinin.a.a@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit A KASAN warning can be triggered when vrealloc() changes the requested size to a value that is not aligned to KASAN_GRANULE_SIZE. ------------[ cut here ]------------ WARNING: CPU: 2 PID: 1 at mm/kasan/shadow.c:174 kasan_unpoison+0x40/0x48 ... pc : kasan_unpoison+0x40/0x48 lr : __kasan_unpoison_vmalloc+0x40/0x68 Call trace: kasan_unpoison+0x40/0x48 (P) vrealloc_node_align_noprof+0x200/0x320 bpf_patch_insn_data+0x90/0x2f0 convert_ctx_accesses+0x8c0/0x1158 bpf_check+0x1488/0x1900 bpf_prog_load+0xd20/0x1258 __sys_bpf+0x96c/0xdf0 __arm64_sys_bpf+0x50/0xa0 invoke_syscall+0x90/0x160 Introduce a dedicated kasan_vrealloc() helper that centralizes KASAN handling for vmalloc reallocations. The helper accounts for KASAN granule alignment when growing or shrinking an allocation and ensures that partial granules are handled correctly. Use this helper from vrealloc_node_align_noprof() to fix poisoning logic. Reported-by: Maciej Żenczykowski Reported-by: Closes: https://lkml.kernel.org/r/CANP3RGeuRW53vukDy7WDO3FiVgu34-xVJYkfpm08oLO3odYFrA@mail.gmail.com Fixes: d699440f58ce ("mm: fix vrealloc()'s KASAN poisoning logic") Cc: stable@vger.kernel.org Signed-off-by: Andrey Ryabinin --- include/linux/kasan.h | 6 ++++++ mm/kasan/shadow.c | 24 ++++++++++++++++++++++++ mm/vmalloc.c | 7 ++----- 3 files changed, 32 insertions(+), 5 deletions(-) diff --git a/include/linux/kasan.h b/include/linux/kasan.h index 9c6ac4b62eb9..ff27712dd3c8 100644 --- a/include/linux/kasan.h +++ b/include/linux/kasan.h @@ -641,6 +641,9 @@ kasan_unpoison_vmap_areas(struct vm_struct **vms, int nr_vms, __kasan_unpoison_vmap_areas(vms, nr_vms, flags); } +void kasan_vrealloc(const void *start, unsigned long old_size, + unsigned long new_size); + #else /* CONFIG_KASAN_VMALLOC */ static inline void kasan_populate_early_vm_area_shadow(void *start, @@ -670,6 +673,9 @@ kasan_unpoison_vmap_areas(struct vm_struct **vms, int nr_vms, kasan_vmalloc_flags_t flags) { } +static inline void kasan_vrealloc(const void *start, unsigned long old_size, + unsigned long new_size) { } + #endif /* CONFIG_KASAN_VMALLOC */ #if (defined(CONFIG_KASAN_GENERIC) || defined(CONFIG_KASAN_SW_TAGS)) && \ diff --git a/mm/kasan/shadow.c b/mm/kasan/shadow.c index 32fbdf759ea2..e9b6b2d8e651 100644 --- a/mm/kasan/shadow.c +++ b/mm/kasan/shadow.c @@ -651,6 +651,30 @@ void __kasan_poison_vmalloc(const void *start, unsigned long size) kasan_poison(start, size, KASAN_VMALLOC_INVALID, false); } +void kasan_vrealloc(const void *addr, unsigned long old_size, + unsigned long new_size) +{ + if (!kasan_enabled()) + return; + + if (new_size < old_size) { + kasan_poison_last_granule(addr, new_size); + + new_size = round_up(new_size, KASAN_GRANULE_SIZE); + old_size = round_up(old_size, KASAN_GRANULE_SIZE); + if (new_size < old_size) + __kasan_poison_vmalloc(addr + new_size, + old_size - new_size); + } else if (new_size > old_size) { + old_size = round_down(old_size, KASAN_GRANULE_SIZE); + __kasan_unpoison_vmalloc(addr + old_size, + new_size - old_size, + KASAN_VMALLOC_PROT_NORMAL | + KASAN_VMALLOC_VM_ALLOC | + KASAN_VMALLOC_KEEP_TAG); + } +} + #else /* CONFIG_KASAN_VMALLOC */ int kasan_alloc_module_shadow(void *addr, size_t size, gfp_t gfp_mask) diff --git a/mm/vmalloc.c b/mm/vmalloc.c index 41dd01e8430c..2536d34df058 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -4322,7 +4322,7 @@ void *vrealloc_node_align_noprof(const void *p, size_t size, unsigned long align if (want_init_on_free() || want_init_on_alloc(flags)) memset((void *)p + size, 0, old_size - size); vm->requested_size = size; - kasan_poison_vmalloc(p + size, old_size - size); + kasan_vrealloc(p, old_size, size); return (void *)p; } @@ -4330,16 +4330,13 @@ void *vrealloc_node_align_noprof(const void *p, size_t size, unsigned long align * We already have the bytes available in the allocation; use them. */ if (size <= alloced_size) { - kasan_unpoison_vmalloc(p + old_size, size - old_size, - KASAN_VMALLOC_PROT_NORMAL | - KASAN_VMALLOC_VM_ALLOC | - KASAN_VMALLOC_KEEP_TAG); /* * No need to zero memory here, as unused memory will have * already been zeroed at initial allocation time or during * realloc shrink time. */ vm->requested_size = size; + kasan_vrealloc(p, old_size, size); return (void *)p; } -- 2.52.0