Re: [PATCH] video: fbdev: sis: fix potential NULL dereference in sisfb_post_sis300()

[Helge Deller]

On 4/1/22 05:41, Haowen Bai wrote:
> bios could be null without checking null and return in this function,
> but still dereference bios[0xf5].
>
> Signed-off-by: Haowen Bai <baihaowen@xxxxxxxxx>

applied.
Thanks!
Helge

> ---
>  drivers/video/fbdev/sis/sis_main.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/video/fbdev/sis/sis_main.c b/drivers/video/fbdev/sis/sis_main.c
> index 742f629..24a0299 100644
> --- a/drivers/video/fbdev/sis/sis_main.c
> +++ b/drivers/video/fbdev/sis/sis_main.c
> @@ -4463,7 +4463,7 @@ static void sisfb_post_sis300(struct pci_dev *pdev)
>  		SiS_SetReg(SISCR, 0x37, 0x02);
>  		SiS_SetReg(SISPART2, 0x00, 0x1c);
>  		v4 = 0x00; v5 = 0x00; v6 = 0x10;
> -		if(ivideo->SiS_Pr.UseROM) {
> +		if (ivideo->SiS_Pr.UseROM && bios) {
>  			v4 = bios[0xf5];
>  			v5 = bios[0xf6];
>  			v6 = bios[0xf7];