[PATCH 1/6] cec: cec_transmit_msg_fh: do sanity checks first

[Hans Verkuil]

The code that fills in the CEC_MSG_CDC_MESSAGE physical address
is now done after the sanity checks. It also only does this if the
message length is >= 4 (i.e. there is room for the physical address).

Signed-off-by: Hans Verkuil <hverkuil-ci...@xs4all.nl>
---
 drivers/media/cec/cec-adap.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/drivers/media/cec/cec-adap.c b/drivers/media/cec/cec-adap.c
index f1261cc2b6fa..b6102510e203 100644
--- a/drivers/media/cec/cec-adap.c
+++ b/drivers/media/cec/cec-adap.c
@@ -740,11 +740,6 @@ int cec_transmit_msg_fh(struct cec_adapter *adap, struct 
cec_msg *msg,
        else
                msg->flags = 0;
 
-       if (msg->len > 1 && msg->msg[1] == CEC_MSG_CDC_MESSAGE) {
-               msg->msg[2] = adap->phys_addr >> 8;
-               msg->msg[3] = adap->phys_addr & 0xff;
-       }
-
        /* Sanity checks */
        if (msg->len == 0 || msg->len > CEC_MAX_MSG_SIZE) {
                dprintk(1, "%s: invalid length %d\n", __func__, msg->len);
@@ -765,6 +760,12 @@ int cec_transmit_msg_fh(struct cec_adapter *adap, struct 
cec_msg *msg,
                dprintk(1, "%s: can't reply to poll msg\n", __func__);
                return -EINVAL;
        }
+
+       if (msg->len >= 4 && msg->msg[1] == CEC_MSG_CDC_MESSAGE) {
+               msg->msg[2] = adap->phys_addr >> 8;
+               msg->msg[3] = adap->phys_addr & 0xff;
+       }
+
        if (msg->len == 1) {
                if (cec_msg_destination(msg) == 0xf) {
                        dprintk(1, "%s: invalid poll message\n", __func__);
-- 
2.20.1