diff options
| author | AlexChen <alex.chen@huawei.com> | 2020-11-02 16:52:17 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-11-02 16:52:17 +0000 |
| commit | 18520fa465a08b81972afd9a25056f102f0180c9 (patch) | |
| tree | d7c7320c5363487282610d6c364329c062be4ebb | |
| parent | 0080edc45e93324e085e93db89180a2945897c5a (diff) | |
| download | qemu-18520fa465a08b81972afd9a25056f102f0180c9.zip qemu-18520fa465a08b81972afd9a25056f102f0180c9.tar.gz qemu-18520fa465a08b81972afd9a25056f102f0180c9.tar.bz2 | |
hw/display/exynos4210_fimd: Fix potential NULL pointer dereference
In exynos4210_fimd_update(), the pointer s is dereferinced before
being check if it is valid, which may lead to NULL pointer dereference.
So move the assignment to global_width after checking that the s is valid.
Reported-by: Euler Robot <euler.robot@huawei.com>
Signed-off-by: Alex Chen <alex.chen@huawei.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-id: 5F9F8D88.9030102@huawei.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | hw/display/exynos4210_fimd.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/hw/display/exynos4210_fimd.c b/hw/display/exynos4210_fimd.c index 4c16e1f..34a960a 100644 --- a/hw/display/exynos4210_fimd.c +++ b/hw/display/exynos4210_fimd.c @@ -1275,12 +1275,14 @@ static void exynos4210_fimd_update(void *opaque) bool blend = false; uint8_t *host_fb_addr; bool is_dirty = false; - const int global_width = (s->vidtcon[2] & FIMD_VIDTCON2_SIZE_MASK) + 1; + int global_width; if (!s || !s->console || !s->enabled || surface_bits_per_pixel(qemu_console_surface(s->console)) == 0) { return; } + + global_width = (s->vidtcon[2] & FIMD_VIDTCON2_SIZE_MASK) + 1; exynos4210_update_resolution(s); surface = qemu_console_surface(s->console); |