Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ffbcee50 authored by Hans Verkuil's avatar Hans Verkuil Committed by Greg Kroah-Hartman
Browse files

media: cec: CEC 2.0-only bcast messages were ignored 



commit cec935ce69fc386f13959578deb40963ebbb85c3 upstream.

Some messages are allowed to be a broadcast message in CEC 2.0
only, and should be ignored by CEC 1.4 devices.

Unfortunately, the check was wrong, causing such messages to be
marked as invalid under CEC 2.0.

Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Cc: <stable@vger.kernel.org>      # for v4.10 and up
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 76373a85

drivers/media/cec/cec-adap.c

+3 −3
Original line number Diff line number Diff line
@@ -1038,11 +1038,11 @@ void cec_received_msg_ts(struct cec_adapter *adap, 
			valid_la = false;

		else if (!cec_msg_is_broadcast(msg) && !(dir_fl & DIRECTED))

			valid_la = false;

		else if (cec_msg_is_broadcast(msg) && !(dir_fl & BCAST1_4))

		else if (cec_msg_is_broadcast(msg) && !(dir_fl & BCAST))

			valid_la = false;

		else if (cec_msg_is_broadcast(msg) &&

			 adap->log_addrs.cec_version >= CEC_OP_CEC_VERSION_2_0 &&

			 !(dir_fl & BCAST2_0))

			 adap->log_addrs.cec_version < CEC_OP_CEC_VERSION_2_0 &&

			 !(dir_fl & BCAST1_4))

			valid_la = false;

	}

	if (valid_la && min_len) {