FGCOM/dahdi-linux
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xpp: Check command type by length

Browse Source 
Prepare for different types of commands: Don't assume a constant size.

Signed-off-by: Tzafrir Cohen <tzafrir.cohen@xorcom.com>
This commit is contained in:
Oron Peled 2015-11-16 15:42:21 -05:00 committed by Tzafrir Cohen
parent 1c68f2ec73
commit 9dfc02a38c
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/dahdi/xpp/card_fxs.c
View File

@ -1579,17 +1579,19 @@ static int FXS_card_register_reply(xbus_t *xbus, xpd_t *xpd, reg_cmd_t *info)
{
unsigned long flags;
struct FXS_priv_data *priv;
__u8 regnum;
bool indirect;
__u8 regnum = 0;
bool indirect = 0;
spin_lock_irqsave(&xpd->lock, flags);
priv = xpd->priv;
BUG_ON(!priv);
indirect = (REG_FIELD(info, regnum) == 0x1E);
regnum = (indirect) ? REG_FIELD(info, subreg) : REG_FIELD(info, regnum);
XPD_DBG(REGS, xpd, "%s reg_num=0x%X, dataL=0x%X dataH=0x%X\n",
(indirect) ? "I" : "D", regnum, REG_FIELD(info, data_low),
REG_FIELD(info, data_high));
if (info->h.bytes == REG_CMD_SIZE(REG)) {
indirect = (REG_FIELD(info, regnum) == 0x1E);
regnum = (indirect) ? REG_FIELD(info, subreg) : REG_FIELD(info, regnum);
XPD_DBG(REGS, xpd, "%s reg_num=0x%X, dataL=0x%X dataH=0x%X\n",
(indirect) ? "I" : "D", regnum, REG_FIELD(info, data_low),
REG_FIELD(info, data_high));
}
if (!indirect && regnum == REG_DTMF_DECODE) {
__u8 val = REG_FIELD(info, data_low);

7
drivers/dahdi/xpp/card_global.c
View File

@ -600,7 +600,12 @@ HANDLER_DEF(GLOBAL, REGISTER_REPLY)
"REGISTER_REPLY: missing card_register_reply()\n");
return -EINVAL;
}
return CALL_XMETHOD(card_register_reply, xpd, reg);
switch (reg->h.bytes) {
case REG_CMD_SIZE(REG):
return CALL_XMETHOD(card_register_reply, xpd, reg);
}
XPD_ERR(xpd, "REGISTER_REPLY: bad packet_len=%d\n", pack->head.packet_len);
return -EINVAL;
}
HANDLER_DEF(GLOBAL, SYNC_REPLY)