lkml.org 
[lkml]   [2020]   [Jan]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Subject[PATCH] hpet: Fix struct size() in kzalloc()
From
Date
Gustavo A. R. Silva wrote:
> > Are you sure the allocation size is the same again? Much like the
> > n_hdlc patch was, I think you need to adjust the variable size here.
> > Maybe, it's a bit of a pain to figure out at a quick glance, I just want
> > to make sure you at least do look at that :)
> >
>
> Yep. The allocation thing was already handled almost a year ago by the
> following patch, and it didn't require to increase the size at that time:
>
> https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=401c9bd10beef4b030eb9e34d16b5341dc6c683b
>

Nope. KASAN splat began because allocation size calculation is wrong.

[ 8.319936] ==================================================================
[ 8.319936] BUG: KASAN: slab-out-of-bounds in hpet_alloc+0x41d/0xdf0
[ 8.319936] Write of size 4 at addr ffff8881e6156928 by task swapper/0/1

[ 8.319936] CPU: 0 PID: 1 Comm: swapper/0 Not tainted 5.5.0+ #248
[ 8.319936] Hardware name: VMware, Inc. VMware Virtual Platform/440BX Desktop Reference Platform, BIOS 6.00 07/29/2019
[ 8.319936] Call Trace:
[ 8.319936] dump_stack+0x163/0x1d5
[ 8.319936] print_address_description.constprop.6+0x1e8/0x3a0
[ 8.319936] ? hpet_alloc+0x41d/0xdf0
[ 8.319936] __kasan_report+0x143/0x1a0
[ 8.319936] ? hpet_alloc+0x41d/0xdf0
[ 8.319936] ? hpet_alloc+0x41d/0xdf0
[ 8.319936] kasan_report+0x12/0x20
[ 8.319936] __asan_report_store4_noabort+0x17/0x20
[ 8.319936] hpet_alloc+0x41d/0xdf0
[ 8.319936] hpet_reserve_platform_timers+0x1eb/0x22f
[ 8.319936] ? hpet_setup+0xd1/0xd1
[ 8.319936] hpet_late_init+0x2f2/0x386
[ 8.319936] ? setup_unknown_nmi_panic+0x15/0x15
[ 8.319936] ? hpet_enable+0x6fa/0x6fa
[ 8.319936] do_one_initcall+0xf6/0x6c0
[ 8.319936] ? perf_trace_initcall_level+0x3f0/0x3f0
[ 8.319936] ? rcu_read_lock_sched_held+0x9c/0xd0
[ 8.319936] ? rcu_read_lock_bh_held+0xb0/0xb0
[ 8.319936] ? __kasan_check_write+0x14/0x20
[ 8.319936] ? __kasan_check_read+0x11/0x20
[ 8.319936] kernel_init_freeable+0x4b0/0x531
[ 8.319936] ? rest_init+0x2f0/0x2f0
[ 8.319936] kernel_init+0x13/0x180
[ 8.319936] ? rest_init+0x2f0/0x2f0
[ 8.319936] ret_from_fork+0x24/0x30

[ 8.319936] Allocated by task 1:
[ 8.319936] save_stack+0x21/0x80
[ 8.319936] __kasan_kmalloc.constprop.7+0xab/0xe0
[ 8.319936] kasan_kmalloc+0x9/0x10
[ 8.319936] __kmalloc+0x17c/0x810
[ 8.319936] hpet_alloc+0x1b4/0xdf0
[ 8.319936] hpet_reserve_platform_timers+0x1eb/0x22f
[ 8.319936] hpet_late_init+0x2f2/0x386
[ 8.319936] do_one_initcall+0xf6/0x6c0
[ 8.319936] kernel_init_freeable+0x4b0/0x531
[ 8.319936] kernel_init+0x13/0x180
[ 8.319936] ret_from_fork+0x24/0x30

[ 8.319936] Freed by task 0:
[ 8.319936] (stack is not available)

[ 8.319936] The buggy address belongs to the object at ffff8881e6156000
which belongs to the cache kmalloc-4k of size 4096
[ 8.319936] The buggy address is located 2344 bytes inside of
4096-byte region [ffff8881e6156000, ffff8881e6157000)
[ 8.319936] The buggy address belongs to the page:
[ 8.319936] page:ffffea0007985580 refcount:1 mapcount:0 mapping:ffff8881f3802000 index:0x0 compound_mapcount: 0
[ 8.319936] raw: 02fffc0000010200 ffffea0007985408 ffff8881f3801a48 ffff8881f3802000
[ 8.319936] raw: 0000000000000000 ffff8881e6156000 0000000100000001 0000000000000000
[ 8.319936] page dumped because: kasan: bad access detected

[ 8.319936] Memory state around the buggy address:
[ 8.320001] ffff8881e6156800: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
[ 8.320096] ffff8881e6156880: 00 00 00 00 00 fc fc fc fc fc fc fc fc fc fc fc
[ 8.320190] >ffff8881e6156900: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc
[ 8.320284] ^
[ 8.320349] ffff8881e6156980: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc
[ 8.320444] ffff8881e6156a00: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc
[ 8.320537] ==================================================================
[ 8.320631] Disabling lock debugging due to kernel taint

We need a patch shown below.



From 2607c3e719bb526e976a88ea8a2f3475688eadb5 Mon Sep 17 00:00:00 2001
From: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Date: Thu, 30 Jan 2020 13:43:23 +0900
Subject: [PATCH] hpet: Fix struct_size() in kzalloc()

Changing "struct hpet_dev hp_dev[1]" to "struct hpet_dev hp_dev[]"
reduces structure size by sizeof(struct hpet_dev) bytes. We need to
compensate it at struct_size().

Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Fixes: 987f028b8637cfa7 ("char: hpet: Use flexible-array member")
---
drivers/char/hpet.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
index aed2c45f7968..ed3b7dab678d 100644
--- a/drivers/char/hpet.c
+++ b/drivers/char/hpet.c
@@ -855,7 +855,7 @@ int hpet_alloc(struct hpet_data *hdp)
return 0;
}

- hpetp = kzalloc(struct_size(hpetp, hp_dev, hdp->hd_nirqs - 1),
+ hpetp = kzalloc(struct_size(hpetp, hp_dev, hdp->hd_nirqs),
GFP_KERNEL);

if (!hpetp)
--
2.11.0
\
 
 \ /
  Last update: 2020-01-30 05:53    [W:0.057 / U:0.084 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site