Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ed8c3cb1 authored by Sudip Mukherjee's avatar Sudip Mukherjee Committed by Greg Kroah-Hartman
Browse files

matroxfb: fix size of memcpy 



commit 59921b239056fb6389a865083284e00ce0518db6 upstream.

hw->DACreg has a size of 80 bytes and MGADACbpp32 has 21. So when
memcpy copies MGADACbpp32 to hw->DACreg it copies 80 bytes but
only 21 bytes are valid.

Signed-off-by: default avatarSudip Mukherjee <sudip.mukherjee@codethink.co.uk>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent dc4bc702

drivers/video/fbdev/matrox/matroxfb_Ti3026.c

+1 −1
Original line number Diff line number Diff line
@@ -372,7 +372,7 @@ static int Ti3026_init(struct matrox_fb_info *minfo, struct my_timming *m) 


	DBG(__func__)



	memcpy(hw->DACreg, MGADACbpp32, sizeof(hw->DACreg));

	memcpy(hw->DACreg, MGADACbpp32, sizeof(MGADACbpp32));

	switch (minfo->fbcon.var.bits_per_pixel) {

		case 4:	hw->DACreg[POS3026_XLATCHCTRL] = TVP3026_XLATCHCTRL_16_1;	/* or _8_1, they are same */

			hw->DACreg[POS3026_XTRUECOLORCTRL] = TVP3026_XTRUECOLORCTRL_PSEUDOCOLOR;