forked from Minki/linux
[media] cec: add flag to cec_log_addrs to enable RC passthrough
By default the CEC_MSG_USER_CONTROL_PRESSED/RELEASED messages are passed on to the follower(s) only. If the new CEC_LOG_ADDRS_FL_ALLOW_RC_PASSTHRU flag is set in the flags field of struct cec_log_addrs then these messages are also passed on to the remote control input subsystem and they will appear as keystrokes. This used to be the default behavior, but now you have to explicitly enable it. This is done to force the caller to think about possible security issues (e.g. if these messages are used to enter passwords). Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
This commit is contained in:
parent
77edf603f2
commit
f4062625ed
@ -166,6 +166,16 @@ logical address types are already defined will return with error ``EBUSY``.
|
||||
it will go back to the unconfigured state. If this flag is set, then it will
|
||||
fallback to the Unregistered logical address. Note that if the Unregistered
|
||||
logical address was explicitly requested, then this flag has no effect.
|
||||
* .. _`CEC-LOG-ADDRS-FL-ALLOW-RC-PASSTHRU`:
|
||||
|
||||
- ``CEC_LOG_ADDRS_FL_ALLOW_RC_PASSTHRU``
|
||||
- 2
|
||||
- By default the ``CEC_MSG_USER_CONTROL_PRESSED`` and ``CEC_MSG_USER_CONTROL_RELEASED``
|
||||
messages are only passed on to the follower(s), if any. If this flag is set,
|
||||
then these messages are also passed on to the remote control input subsystem
|
||||
and will appear as keystrokes. This features needs to be enabled explicitly.
|
||||
If CEC is used to enter e.g. passwords, then you may not want to enable this
|
||||
to avoid trivial snooping of the keystrokes.
|
||||
|
||||
.. tabularcolumns:: |p{6.6cm}|p{2.2cm}|p{8.7cm}|
|
||||
|
||||
|
@ -13,8 +13,6 @@ Hopefully this will happen later in 2016.
|
||||
Other TODOs:
|
||||
|
||||
- There are two possible replies to CEC_MSG_INITIATE_ARC. How to handle that?
|
||||
- Add a flag to inhibit passing CEC RC messages to the rc subsystem.
|
||||
Applications should be able to choose this when calling S_LOG_ADDRS.
|
||||
- If the reply field of cec_msg is set then when the reply arrives it
|
||||
is only sent to the filehandle that transmitted the original message
|
||||
and not to any followers. Should this behavior change or perhaps
|
||||
|
@ -1478,7 +1478,8 @@ static int cec_receive_notify(struct cec_adapter *adap, struct cec_msg *msg,
|
||||
}
|
||||
|
||||
case CEC_MSG_USER_CONTROL_PRESSED:
|
||||
if (!(adap->capabilities & CEC_CAP_RC))
|
||||
if (!(adap->capabilities & CEC_CAP_RC) ||
|
||||
!(adap->log_addrs.flags & CEC_LOG_ADDRS_FL_ALLOW_RC_PASSTHRU))
|
||||
break;
|
||||
|
||||
#if IS_REACHABLE(CONFIG_RC_CORE)
|
||||
@ -1515,7 +1516,8 @@ static int cec_receive_notify(struct cec_adapter *adap, struct cec_msg *msg,
|
||||
break;
|
||||
|
||||
case CEC_MSG_USER_CONTROL_RELEASED:
|
||||
if (!(adap->capabilities & CEC_CAP_RC))
|
||||
if (!(adap->capabilities & CEC_CAP_RC) ||
|
||||
!(adap->log_addrs.flags & CEC_LOG_ADDRS_FL_ALLOW_RC_PASSTHRU))
|
||||
break;
|
||||
#if IS_REACHABLE(CONFIG_RC_CORE)
|
||||
rc_keyup(adap->rc);
|
||||
|
@ -162,7 +162,8 @@ static long cec_adap_s_log_addrs(struct cec_adapter *adap, struct cec_fh *fh,
|
||||
return -ENOTTY;
|
||||
if (copy_from_user(&log_addrs, parg, sizeof(log_addrs)))
|
||||
return -EFAULT;
|
||||
log_addrs.flags &= CEC_LOG_ADDRS_FL_ALLOW_UNREG_FALLBACK;
|
||||
log_addrs.flags &= CEC_LOG_ADDRS_FL_ALLOW_UNREG_FALLBACK |
|
||||
CEC_LOG_ADDRS_FL_ALLOW_RC_PASSTHRU;
|
||||
mutex_lock(&adap->lock);
|
||||
if (!adap->is_configuring &&
|
||||
(!log_addrs.num_log_addrs || !adap->is_configured) &&
|
||||
|
@ -391,6 +391,8 @@ struct cec_log_addrs {
|
||||
|
||||
/* Allow a fallback to unregistered */
|
||||
#define CEC_LOG_ADDRS_FL_ALLOW_UNREG_FALLBACK (1 << 0)
|
||||
/* Passthrough RC messages to the input subsystem */
|
||||
#define CEC_LOG_ADDRS_FL_ALLOW_RC_PASSTHRU (1 << 1)
|
||||
|
||||
/* Events */
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user