diff options
| author | Peng Fan <Peng.Fan@freescale.com> | 2015-11-27 10:00:10 +0800 |
|---|---|---|
| committer | Anatolij Gustschin <agust@denx.de> | 2015-11-30 09:18:36 +0100 |
| commit | 3dbdb4dd4f8e5847b8f7d6dbd849e0b9a0907a5b (patch) | |
| tree | 77281057a3c7fca791535702e432ec46c55b3df5 | |
| parent | 05bfe1321024e2ae0039dc16f17d2165610fb4fd (diff) | |
| download | blackbird-obmc-uboot-3dbdb4dd4f8e5847b8f7d6dbd849e0b9a0907a5b.tar.gz blackbird-obmc-uboot-3dbdb4dd4f8e5847b8f7d6dbd849e0b9a0907a5b.zip | |
video: ipu: fix out of bounds access
We need to access reg stp_rep9, but not stp_rep[(9 - 1) / 2].
If using "__raw_writel(0, DI_STP_REP(disp, 9))", this will exceeds
the size of stp_rep array.
Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
Acked-by: Liu Ying <Ying.Liu@freescale.com>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Anatolij Gustschin <agust@denx.de>
| -rw-r--r-- | drivers/video/ipu_disp.c | 2 | ||||
| -rw-r--r-- | drivers/video/ipu_regs.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/video/ipu_disp.c b/drivers/video/ipu_disp.c index 4faeafb635..e08ddd4a4e 100644 --- a/drivers/video/ipu_disp.c +++ b/drivers/video/ipu_disp.c @@ -1119,7 +1119,7 @@ int32_t ipu_init_sync_panel(int disp, uint32_t pixel_clk, reg &= 0x0000FFFF; __raw_writel(reg, DI_STP_REP(disp, 6)); __raw_writel(0, DI_STP_REP(disp, 7)); - __raw_writel(0, DI_STP_REP(disp, 9)); + __raw_writel(0, DI_STP_REP9(disp)); /* Init template microcode */ if (disp) { diff --git a/drivers/video/ipu_regs.h b/drivers/video/ipu_regs.h index c2c134a7de..0d3fe069e9 100644 --- a/drivers/video/ipu_regs.h +++ b/drivers/video/ipu_regs.h @@ -338,6 +338,7 @@ struct ipu_dmfc { #define DI_SW_GEN0(di, gen) (&DI_REG(di)->sw_gen0[gen - 1]) #define DI_SW_GEN1(di, gen) (&DI_REG(di)->sw_gen1[gen - 1]) #define DI_STP_REP(di, gen) (&DI_REG(di)->stp_rep[(gen - 1) / 2]) +#define DI_STP_REP9(di) (&DI_REG(di)->stp_rep9) #define DI_SYNC_AS_GEN(di) (&DI_REG(di)->sync_as) #define DI_DW_GEN(di, gen) (&DI_REG(di)->dw_gen[gen]) #define DI_DW_SET(di, gen, set) (&DI_REG(di)->dw_set[gen + 12 * set]) |
