| From 0201adb6bc392f590297aa8a9ca9424f7f4c97a6 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 17 Oct 2019 23:41:50 -0500 |
| Subject: drm/gma500: fix memory disclosures due to uninitialized bytes |
| |
| From: Kangjie Lu <kjlu@umn.edu> |
| |
| [ Upstream commit ec3b7b6eb8c90b52f61adff11b6db7a8db34de19 ] |
| |
| "clock" may be copied to "best_clock". Initializing best_clock |
| is not sufficient. The fix initializes clock as well to avoid |
| memory disclosures and informaiton leaks. |
| |
| Signed-off-by: Kangjie Lu <kjlu@umn.edu> |
| Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> |
| Link: https://patchwork.freedesktop.org/patch/msgid/20191018044150.1899-1-kjlu@umn.edu |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/gpu/drm/gma500/oaktrail_crtc.c | 2 ++ |
| 1 file changed, 2 insertions(+) |
| |
| diff --git a/drivers/gpu/drm/gma500/oaktrail_crtc.c b/drivers/gpu/drm/gma500/oaktrail_crtc.c |
| index 1b7fd6a9d8a5..f73a02a2a5b3 100644 |
| --- a/drivers/gpu/drm/gma500/oaktrail_crtc.c |
| +++ b/drivers/gpu/drm/gma500/oaktrail_crtc.c |
| @@ -139,6 +139,7 @@ static bool mrst_sdvo_find_best_pll(const struct gma_limit_t *limit, |
| s32 freq_error, min_error = 100000; |
| |
| memset(best_clock, 0, sizeof(*best_clock)); |
| + memset(&clock, 0, sizeof(clock)); |
| |
| for (clock.m = limit->m.min; clock.m <= limit->m.max; clock.m++) { |
| for (clock.n = limit->n.min; clock.n <= limit->n.max; |
| @@ -195,6 +196,7 @@ static bool mrst_lvds_find_best_pll(const struct gma_limit_t *limit, |
| int err = target; |
| |
| memset(best_clock, 0, sizeof(*best_clock)); |
| + memset(&clock, 0, sizeof(clock)); |
| |
| for (clock.m = limit->m.min; clock.m <= limit->m.max; clock.m++) { |
| for (clock.p1 = limit->p1.min; clock.p1 <= limit->p1.max; |
| -- |
| 2.20.1 |
| |