Unverified Commit 63581815 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!15313 video: fbdev: smscufx: Fix null-ptr-deref in ufx_usb_probe() 

Merge Pull Request from: @ci-robot 
 
PR sync from: Yang Yingliang <yangyingliang@huawei.com>
https://mailweb.openeuler.org/archives/list/kernel@openeuler.org/message/75QVWJX4YIZBGKB5LFLRGRZHUOVWEMIO/ 
 
https://gitee.com/src-openeuler/kernel/issues/IBP6B9 
 
Link:https://gitee.com/openeuler/kernel/pulls/15313

 

Reviewed-by: default avatarXiongfeng Wang <wangxiongfeng2@huawei.com>
Reviewed-by: default avatarYuan Can <yuancan@huawei.com>
Signed-off-by: default avatarYuan Can <yuancan@huawei.com>
parents 5c608d31 1320958e

drivers/video/fbdev/smscufx.c

+1 −2
Original line number Diff line number Diff line
@@ -1670,6 +1670,7 @@ static int ufx_usb_probe(struct usb_interface *interface, 
	info->par = dev;

	info->pseudo_palette = dev->pseudo_palette;

	info->fbops = &ufx_ops;

	INIT_LIST_HEAD(&info->modelist);



	retval = fb_alloc_cmap(&info->cmap, 256, 0);

	if (retval < 0) {
@@ -1680,8 +1681,6 @@ static int ufx_usb_probe(struct usb_interface *interface, 
	INIT_DELAYED_WORK(&dev->free_framebuffer_work,

			  ufx_free_framebuffer_work);



	INIT_LIST_HEAD(&info->modelist);



	retval = ufx_reg_read(dev, 0x3000, &id_rev);

	check_warn_goto_error(retval, "error %d reading 0x3000 register from device", retval);

	dev_dbg(dev->gdev, "ID_REV register value 0x%08x", id_rev);