Skip to content

Commit

Permalink
firedtv: use length_field() of PMT as length
Browse files Browse the repository at this point in the history
Parsed and used the length_field() of the PMT message instead of using
the length field of the message struct, which does not seem to be filled
correctly by e.g. MythTV.

Signed-off-by: Henrik Kurelid <henrik@kurelid.se>
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
  • Loading branch information
Henrik Kurelid authored and Stefan Richter committed Feb 24, 2009
1 parent 096edfb commit 7199e52
Showing 1 changed file with 13 additions and 7 deletions.
20 changes: 13 additions & 7 deletions drivers/media/dvb/firesat/firesat-ci.c
Original file line number Diff line number Diff line change
Expand Up @@ -127,14 +127,20 @@ static int firesat_ca_pmt(struct firesat *firesat, void *arg)
{
struct ca_msg *msg = arg;
int data_pos;
int data_length;
int i;

data_pos = 4;
if (msg->msg[3] & 0x80) {
data_length = 0;
for (i = 0; i < (msg->msg[3] & 0x7F); i++)
data_length = (data_length << 8) + msg->msg[data_pos++];
} else {
data_length = msg->msg[3];
}

if (msg->msg[3] & 0x80)
data_pos = (msg->msg[4] && 0x7F) + 4;
else
data_pos = 4;

return avc_ca_pmt(firesat, &msg->msg[data_pos],
msg->length - data_pos) ? -EFAULT : 0;
return avc_ca_pmt(firesat, &msg->msg[data_pos], data_length) ?
-EFAULT : 0;
}

static int firesat_ca_send_msg(struct firesat *firesat, void *arg)
Expand Down

0 comments on commit 7199e52

Please sign in to comment.