Commit 92826905 authored by Zhang Lixu's avatar Zhang Lixu Committed by Jiri Kosina
Browse files

HID: intel-ish-hid: ipc: Fix dev_err usage with uninitialized dev->devc 



The variable dev->devc in ish_dev_init was utilized by dev_err before it
was properly assigned. To rectify this, the assignment of dev->devc has
been moved to immediately follow memory allocation.

Without this change "(NULL device *)" is printed for device information.

Fixes: 8ae2f2b0 ("HID: intel-ish-hid: ipc: Fix potential use-after-free in work function")
Fixes: ae02e5d4 ("HID: intel-ish-hid: ipc layer")
Signed-off-by: default avatarZhang Lixu <lixu.zhang@intel.com>
Acked-by: default avatarSrinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.com>
parent 9c0f59e4

drivers/hid/intel-ish-hid/ipc/ipc.c

+1 −1
Original line number Diff line number Diff line
@@ -948,6 +948,7 @@ struct ishtp_device *ish_dev_init(struct pci_dev *pdev) 
	if (!dev)

		return NULL;



	dev->devc = &pdev->dev;

	ishtp_device_init(dev);



	init_waitqueue_head(&dev->wait_hw_ready);
@@ -983,7 +984,6 @@ struct ishtp_device *ish_dev_init(struct pci_dev *pdev) 
	}



	dev->ops = &ish_hw_ops;

	dev->devc = &pdev->dev;

	dev->mtu = IPC_PAYLOAD_SIZE - sizeof(struct ishtp_msg_hdr);

	return dev;

}