Skip to content

Commit

Permalink
Merge tag 'char-misc-5.6-rc1-2' of git://git.kernel.org/pub/scm/linux…
Browse files Browse the repository at this point in the history
…/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
  • Loading branch information
torvalds committed Feb 3, 2020
2 parents 2367da5 + 98c49f1 commit 754beee
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/char/hpet.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 754beee

Please sign in to comment.