Skip to content

Commit 2f1a9f6

Browse files
committed
Merge branch 'ieee802154-for-davem-2018-12-11' of git://git.kernel.org/pub/scm/linux/kernel/git/sschmidt/wpan
Stefan Schmidt says: ==================== pull-request: ieee802154 for net 2018-12-11 An update from ieee802154 for your *net* tree. Just two more fixes for ieee802154 dribver before the final 4.20 release. Alexander Aring fixes a problem in the nested parsing code of the hwsim driver interface. A fix for a potential overflow in the ca8210 driver by Yue Habing. ==================== Signed-off-by: David S. Miller <[email protected]>
2 parents 290974d + 8e41cae commit 2f1a9f6

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

drivers/net/ieee802154/ca8210.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -721,7 +721,7 @@ static void ca8210_mlme_reset_worker(struct work_struct *work)
721721
static void ca8210_rx_done(struct cas_control *cas_ctl)
722722
{
723723
u8 *buf;
724-
u8 len;
724+
unsigned int len;
725725
struct work_priv_container *mlme_reset_wpc;
726726
struct ca8210_priv *priv = cas_ctl->priv;
727727

@@ -730,7 +730,7 @@ static void ca8210_rx_done(struct cas_control *cas_ctl)
730730
if (len > CA8210_SPI_BUF_SIZE) {
731731
dev_crit(
732732
&priv->spi->dev,
733-
"Received packet len (%d) erroneously long\n",
733+
"Received packet len (%u) erroneously long\n",
734734
len
735735
);
736736
goto finish;

drivers/net/ieee802154/mac802154_hwsim.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -492,7 +492,7 @@ static int hwsim_del_edge_nl(struct sk_buff *msg, struct genl_info *info)
492492
!info->attrs[MAC802154_HWSIM_ATTR_RADIO_EDGE])
493493
return -EINVAL;
494494

495-
if (nla_parse_nested(edge_attrs, MAC802154_HWSIM_EDGE_ATTR_MAX + 1,
495+
if (nla_parse_nested(edge_attrs, MAC802154_HWSIM_EDGE_ATTR_MAX,
496496
info->attrs[MAC802154_HWSIM_ATTR_RADIO_EDGE],
497497
hwsim_edge_policy, NULL))
498498
return -EINVAL;
@@ -542,7 +542,7 @@ static int hwsim_set_edge_lqi(struct sk_buff *msg, struct genl_info *info)
542542
!info->attrs[MAC802154_HWSIM_ATTR_RADIO_EDGE])
543543
return -EINVAL;
544544

545-
if (nla_parse_nested(edge_attrs, MAC802154_HWSIM_EDGE_ATTR_MAX + 1,
545+
if (nla_parse_nested(edge_attrs, MAC802154_HWSIM_EDGE_ATTR_MAX,
546546
info->attrs[MAC802154_HWSIM_ATTR_RADIO_EDGE],
547547
hwsim_edge_policy, NULL))
548548
return -EINVAL;

0 commit comments

Comments
 (0)