Skip to content

Commit 754beee

Browse files
committed
Merge tag 'char-misc-5.6-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
Pull char/misc fix from Greg KH: "Here is a single patch, that fixes up a commit that came in the previous char/misc merge. It fixes a bug in the hpet driver that everyone keeps tripping over in their automated testing. Good thing is, people are catching it. Bad thing it wasn't caught by anyone testing before this. Oh well... This has been in linux-next for a few days with no reported issues" * tag 'char-misc-5.6-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: char: hpet: Fix out-of-bounds read bug
2 parents 2367da5 + 98c49f1 commit 754beee

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/char/hpet.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -855,7 +855,7 @@ int hpet_alloc(struct hpet_data *hdp)
855855
return 0;
856856
}
857857

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

861861
if (!hpetp)

0 commit comments

Comments
 (0)