Commit 12a5fb41 authored by Abhishek Pandit-Subedi's avatar Abhishek Pandit-Subedi Committed by Zhang Zekun
Browse files

usb: typec: ucsi: Fix null pointer dereference in trace 

stable inclusion
from stable-v5.10.226
commit 7e64cabe81c303bdf6fd26b6a09a3289b33bc870
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IARV3B
CVE: CVE-2024-46719

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=7e64cabe81c303bdf6fd26b6a09a3289b33bc870



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

[ Upstream commit 99516f76db48e1a9d54cdfed63c1babcee4e71a5 ]

ucsi_register_altmode checks IS_ERR for the alt pointer and treats
NULL as valid. When CONFIG_TYPEC_DP_ALTMODE is not enabled,
ucsi_register_displayport returns NULL which causes a NULL pointer
dereference in trace. Rather than return NULL, call
typec_port_register_altmode to register DisplayPort alternate mode
as a non-controllable mode when CONFIG_TYPEC_DP_ALTMODE is not enabled.

Reviewed-by: default avatarBenson Leung <bleung@chromium.org>
Reviewed-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: default avatarAbhishek Pandit-Subedi <abhishekpandit@chromium.org>
Signed-off-by: default avatarJameson Thies <jthies@google.com>
Reviewed-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://lore.kernel.org/r/20240510201244.2968152-2-jthies@google.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarZhang Zekun <zhangzekun11@huawei.com>
parent dc55753c

drivers/usb/typec/ucsi/ucsi.h

+1 −1
Original line number Diff line number Diff line
@@ -376,7 +376,7 @@ ucsi_register_displayport(struct ucsi_connector *con, 
			  bool override, int offset,

			  struct typec_altmode_desc *desc)

{

	return NULL;

	return typec_port_register_altmode(con->port, desc);

}



static inline void