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

!11536 usb: gadget: f_ncm: fix potential NULL ptr deref in ncm_bitrate() 

Merge Pull Request from: @ci-robot 
 
PR sync from: Wang Hai <wanghai38@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/N7MUUEDPLDUURZBP3BKZQ6XJCZ4OYTZ6/ 
 
https://gitee.com/src-openeuler/kernel/issues/IALIDP 
 
Link:https://gitee.com/openeuler/kernel/pulls/11536

 

Reviewed-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents 6193ca62 c5e36e3a

drivers/usb/gadget/function/f_ncm.c

+3 −1
Original line number Diff line number Diff line
@@ -85,7 +85,9 @@ static inline struct f_ncm *func_to_ncm(struct usb_function *f) 
/* peak (theoretical) bulk transfer rate in bits-per-second */

static inline unsigned ncm_bitrate(struct usb_gadget *g)

{

	if (gadget_is_superspeed(g) && g->speed >= USB_SPEED_SUPER_PLUS)

	if (!g)

		return 0;

	else if (gadget_is_superspeed(g) && g->speed >= USB_SPEED_SUPER_PLUS)

		return 4250000000U;

	else if (gadget_is_superspeed(g) && g->speed == USB_SPEED_SUPER)

		return 3750000000U;