Commit 2f1a9f66 authored by David S. Miller's avatar David S. Miller

Merge branch 'ieee802154-for-davem-2018-12-11' of...

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: default avatarDavid S. Miller <davem@davemloft.net>
parents 290974d4 8e41cae6
...@@ -721,7 +721,7 @@ static void ca8210_mlme_reset_worker(struct work_struct *work) ...@@ -721,7 +721,7 @@ static void ca8210_mlme_reset_worker(struct work_struct *work)
static void ca8210_rx_done(struct cas_control *cas_ctl) static void ca8210_rx_done(struct cas_control *cas_ctl)
{ {
u8 *buf; u8 *buf;
u8 len; unsigned int len;
struct work_priv_container *mlme_reset_wpc; struct work_priv_container *mlme_reset_wpc;
struct ca8210_priv *priv = cas_ctl->priv; struct ca8210_priv *priv = cas_ctl->priv;
...@@ -730,7 +730,7 @@ static void ca8210_rx_done(struct cas_control *cas_ctl) ...@@ -730,7 +730,7 @@ static void ca8210_rx_done(struct cas_control *cas_ctl)
if (len > CA8210_SPI_BUF_SIZE) { if (len > CA8210_SPI_BUF_SIZE) {
dev_crit( dev_crit(
&priv->spi->dev, &priv->spi->dev,
"Received packet len (%d) erroneously long\n", "Received packet len (%u) erroneously long\n",
len len
); );
goto finish; goto finish;
......
...@@ -492,7 +492,7 @@ static int hwsim_del_edge_nl(struct sk_buff *msg, struct genl_info *info) ...@@ -492,7 +492,7 @@ static int hwsim_del_edge_nl(struct sk_buff *msg, struct genl_info *info)
!info->attrs[MAC802154_HWSIM_ATTR_RADIO_EDGE]) !info->attrs[MAC802154_HWSIM_ATTR_RADIO_EDGE])
return -EINVAL; return -EINVAL;
if (nla_parse_nested(edge_attrs, MAC802154_HWSIM_EDGE_ATTR_MAX + 1, if (nla_parse_nested(edge_attrs, MAC802154_HWSIM_EDGE_ATTR_MAX,
info->attrs[MAC802154_HWSIM_ATTR_RADIO_EDGE], info->attrs[MAC802154_HWSIM_ATTR_RADIO_EDGE],
hwsim_edge_policy, NULL)) hwsim_edge_policy, NULL))
return -EINVAL; return -EINVAL;
...@@ -542,7 +542,7 @@ static int hwsim_set_edge_lqi(struct sk_buff *msg, struct genl_info *info) ...@@ -542,7 +542,7 @@ static int hwsim_set_edge_lqi(struct sk_buff *msg, struct genl_info *info)
!info->attrs[MAC802154_HWSIM_ATTR_RADIO_EDGE]) !info->attrs[MAC802154_HWSIM_ATTR_RADIO_EDGE])
return -EINVAL; return -EINVAL;
if (nla_parse_nested(edge_attrs, MAC802154_HWSIM_EDGE_ATTR_MAX + 1, if (nla_parse_nested(edge_attrs, MAC802154_HWSIM_EDGE_ATTR_MAX,
info->attrs[MAC802154_HWSIM_ATTR_RADIO_EDGE], info->attrs[MAC802154_HWSIM_ATTR_RADIO_EDGE],
hwsim_edge_policy, NULL)) hwsim_edge_policy, NULL))
return -EINVAL; return -EINVAL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment