diff options
| author | Hans Verkuil <hverkuil-cisco@xs4all.nl> | 2023-03-24 17:52:57 +0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@kernel.org> | 2023-04-15 09:48:39 +0300 |
| commit | 6bade236f14033fa457a9e22ceb8a114a14d90e3 (patch) | |
| tree | 4178ebccb8d073a6618427f0df65ed551661d392 /drivers/media/cec/core/cec-adap.c | |
| parent | f100ce3bbd6aa0093075b20b9dbd006686f6aedf (diff) | |
| download | linux-6bade236f14033fa457a9e22ceb8a114a14d90e3.tar.xz | |
media: cec: core: not all messages were passed on when monitoring
The valid_la boolean is used to check if the destination logical
address is either 15 (broadcast) or our logical address. If it is
for another logical address, then only adapters that have the
CEC_CAP_MONITOR_ALL capability can pass it on.
However, it is also used to do more detailed validity checks,
such as whether the message was broadcast when it should have been
directed, or vice versa, in which case the message must be ignored
according to the spec. But that should not apply to monitoring.
Add a new bool that just checks the LA and nothing else.
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
Diffstat (limited to 'drivers/media/cec/core/cec-adap.c')
| -rw-r--r-- | drivers/media/cec/core/cec-adap.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/media/cec/core/cec-adap.c b/drivers/media/cec/core/cec-adap.c index 4f5ab3cae8a7..769ea6b2e1d0 100644 --- a/drivers/media/cec/core/cec-adap.c +++ b/drivers/media/cec/core/cec-adap.c @@ -1052,6 +1052,7 @@ void cec_received_msg_ts(struct cec_adapter *adap, u8 cmd = msg->msg[1]; bool is_reply = false; bool valid_la = true; + bool monitor_valid_la = true; u8 min_len = 0; if (WARN_ON(!msg->len || msg->len > CEC_MAX_MSG_SIZE)) @@ -1093,8 +1094,10 @@ void cec_received_msg_ts(struct cec_adapter *adap, adap->last_initiator = 0xff; /* Check if this message was for us (directed or broadcast). */ - if (!cec_msg_is_broadcast(msg)) + if (!cec_msg_is_broadcast(msg)) { valid_la = cec_has_log_addr(adap, msg_dest); + monitor_valid_la = valid_la; + } /* * Check if the length is not too short or if the message is a @@ -1227,7 +1230,7 @@ void cec_received_msg_ts(struct cec_adapter *adap, mutex_unlock(&adap->lock); /* Pass the message on to any monitoring filehandles */ - cec_queue_msg_monitor(adap, msg, valid_la); + cec_queue_msg_monitor(adap, msg, monitor_valid_la); /* We're done if it is not for us or a poll message */ if (!valid_la || msg->len <= 1) |