Commit df3e3169 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "usb: typec: ucsi: Fix null pointer dereference in ucsi_sync_control_common" 

This reverts commit 14ad4c10.

The originally offending commit will be reverted instead of this fix up
at this point in time, so revert this fix.

Cc: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Cc: Mario Limonciello (AMD) <superm1@kernel.org>
Cc: stable <stable@kernel.org>
Cc: Johan Hovold <johan@kernel.org>
Fixes: 14ad4c10 ("usb: typec: ucsi: Fix null pointer dereference in ucsi_sync_control_common")
Link: https://lore.kernel.org/r/20251222152204.2846-1-johan@kernel.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0dc580d4

drivers/usb/typec/ucsi/ucsi.c

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ int ucsi_sync_control_common(struct ucsi *ucsi, u64 command, u32 *cci) 
	if (!ret && cci)

		ret = ucsi->ops->read_cci(ucsi, cci);



	if (!ret && cci && ucsi->message_in_size > 0 &&

	if (!ret && ucsi->message_in_size > 0 &&

	    (*cci & UCSI_CCI_COMMAND_COMPLETE))

		ret = ucsi->ops->read_message_in(ucsi, ucsi->message_in,

						 ucsi->message_in_size);