瀏覽代碼

cadence_uart: Check baud rate generator and divider values on migration

The Cadence UART device emulator calculates speed by dividing the
baud rate by a 'baud rate generator' & 'baud rate divider' value.
The device specification defines these register values to be
non-zero and within certain limits. Checks were recently added when
writing to these registers but not when restoring from migration.

This patch adds checks when restoring from migration to avoid divide by
zero errors.

Reported-by: Huawei PSIRT <psirt@huawei.com>
Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>
Message-id: 04ae30ed8ee1758cd2d2af880da4d28f74c67738.1481132150.git.alistair.francis@xilinx.com
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Alistair Francis 8 年之前
父節點
當前提交
450aaae863
共有 1 個文件被更改,包括 7 次插入0 次删除
  1. 7 0
      hw/char/cadence_uart.c

+ 7 - 0
hw/char/cadence_uart.c

@@ -502,6 +502,13 @@ static int cadence_uart_post_load(void *opaque, int version_id)
 {
 {
     CadenceUARTState *s = opaque;
     CadenceUARTState *s = opaque;
 
 
+    /* Ensure these two aren't invalid numbers */
+    if (s->r[R_BRGR] < 1 || s->r[R_BRGR] & ~0xFFFF ||
+        s->r[R_BDIV] <= 3 || s->r[R_BDIV] & ~0xFF) {
+        /* Value is invalid, abort */
+        return 1;
+    }
+
     uart_parameters_setup(s);
     uart_parameters_setup(s);
     uart_update_status(s);
     uart_update_status(s);
     return 0;
     return 0;