Branch: refs/heads/master Home: https://github.com/qemu/qemu Commit: b55a06df4f03f21e8a32e9d067a8a5782ac3ce0d https://github.com/qemu/qemu/commit/b55a06df4f03f21e8a32e9d067a8a5782ac3ce0d Author: liujunjie <liujunji...@huawei.com> Date: 2018-06-18 (Mon, 18 Jun 2018)
Changed paths: M hw/input/ps2.c Log Message: ----------- ps2: check PS2Queue wptr pointer in post_load routine In commit 802cbcb7300, most issues have been fixed when qemu guest migration. But the queue size still need to check whether is equal to PS2_QUEUE_SIZE. If yes, the wptr should set as 0. Or, wptr would larger than PS2_QUEUE_SIZE and never come back when ps2_queue_noirq is called. This could lead to OOB access, add check to avoid it. Signed-off-by: liujunjie <liujunji...@huawei.com> Reviewed-by: Gonglei <arei.gong...@huawei.com> Message-id: 20180607080237.12360-1-liujunji...@huawei.com Signed-off-by: Gerd Hoffmann <kra...@redhat.com> Commit: e8729c154b3fb97232e640a43c832122f0fdd32d https://github.com/qemu/qemu/commit/e8729c154b3fb97232e640a43c832122f0fdd32d Author: Peter Maydell <peter.mayd...@linaro.org> Date: 2018-06-19 (Tue, 19 Jun 2018) Changed paths: M hw/input/ps2.c Log Message: ----------- Merge remote-tracking branch 'remotes/kraxel/tags/input-20180618-pull-request' into staging input: ps2 post_load fix. # gpg: Signature made Mon 18 Jun 2018 11:18:30 BST # gpg: using RSA key 4CB6D8EED3E87138 # gpg: Good signature from "Gerd Hoffmann (work) <kra...@redhat.com>" # gpg: aka "Gerd Hoffmann <g...@kraxel.org>" # gpg: aka "Gerd Hoffmann (private) <kra...@gmail.com>" # Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138 * remotes/kraxel/tags/input-20180618-pull-request: ps2: check PS2Queue wptr pointer in post_load routine Signed-off-by: Peter Maydell <peter.mayd...@linaro.org> Compare: https://github.com/qemu/qemu/compare/59926de9987c...e8729c154b3f **NOTE:** This service been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/ Functionality will be removed from GitHub.com on January 31st, 2019.