Skip to content

Commit

Permalink
[media] mceusb: move check earlier to make smatch happy
Browse files Browse the repository at this point in the history
Smatch complains that "cmdbuf[cmdcount - length]" might go past the end
of the array.  It's an easy warning to silence by moving the limit
check earlier.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Dan Carpenter authored and Mauro Carvalho Chehab committed Feb 13, 2013
1 parent 4db45af commit b940a22
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/media/rc/mceusb.c
Original file line number Diff line number Diff line change
Expand Up @@ -828,16 +828,16 @@ static int mceusb_tx_ir(struct rc_dev *dev, unsigned *txbuf, unsigned count)
(txbuf[i] -= MCE_MAX_PULSE_LENGTH));
}

/* Fix packet length in last header */
length = cmdcount % MCE_CODE_LENGTH;
cmdbuf[cmdcount - length] -= MCE_CODE_LENGTH - length;

/* Check if we have room for the empty packet at the end */
if (cmdcount >= MCE_CMDBUF_SIZE) {
ret = -EINVAL;
goto out;
}

/* Fix packet length in last header */
length = cmdcount % MCE_CODE_LENGTH;
cmdbuf[cmdcount - length] -= MCE_CODE_LENGTH - length;

/* All mce commands end with an empty packet (0x80) */
cmdbuf[cmdcount++] = MCE_IRDATA_TRAILER;

Expand Down

0 comments on commit b940a22

Please sign in to comment.