Commit 1e2f5ad3 authored by Yuyao Lin's avatar Yuyao Lin Committed by Yongqiang Liu
Browse files

USB: Fix kABI for usb_device->reset_in_progress 

hulk inclusion
category: bugfix
bugzilla:https://gitee.com/src-openeuler/kernel/issues/I675RE


CVE: CVE-2022-4662

--------------------------------

Fix kABI by using  __GENKSYMS__ for usb_device->reset_in_progress.

Signed-off-by: default avatarYuyao Lin <linyuyao1@huawei.com>
Reviewed-by: default avatarzhangjialin <zhangjialin11@huawei.com>
Reviewed-by: default avatarWei Li <liwei391@huawei.com>
Signed-off-by: default avatarYongqiang Liu <liuyongqiang13@huawei.com>
parent b81c162f

include/linux/usb.h

+5 −1
Original line number Original line Diff line number Diff line
@@ -665,7 +665,6 @@ struct usb_device { 




	unsigned can_submit:1;

	unsigned can_submit:1;

	unsigned persist_enabled:1;

	unsigned persist_enabled:1;

	unsigned reset_in_progress:1;

	unsigned have_langid:1;

	unsigned have_langid:1;

	unsigned authorized:1;

	unsigned authorized:1;

	unsigned authenticated:1;

	unsigned authenticated:1;
@@ -677,6 +676,11 @@ struct usb_device { 
	unsigned usb2_hw_lpm_allowed:1;

	unsigned usb2_hw_lpm_allowed:1;

	unsigned usb3_lpm_u1_enabled:1;

	unsigned usb3_lpm_u1_enabled:1;

	unsigned usb3_lpm_u2_enabled:1;

	unsigned usb3_lpm_u2_enabled:1;



#ifndef __GENKSYMS__

	unsigned reset_in_progress:1;

#endif



	int string_langid;

	int string_langid;





	/* static strings from the device */

	/* static strings from the device */