Skip to contentSkip to conversation

ieee802154: hwsim: fix off-by-one in parse nested

PATCH Superseded Alexander Aring 1 participant 2 messages Nov 30, 2018

Subsystems (2)
Network drivers IEEE 802.15.4

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Alexander Aring

author
#0 lore raw

PATCH 1/1 ieee802154: hwsim: fix off-by-one in parse nested

This patch fixes a off-by-one mistake in nla_parse_nested() functions of mac802154_hwsim driver. I had to enabled stack protector so I was able to reproduce it.

Reference: https://github.com/linux-wpan/wpan-tools/issues/17

Signed-off-by Alexander Aring <[email protected]>
---
 drivers/net/ieee802154/mac802154_hwsim.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/net/ieee802154/mac802154_hwsim.c +3 -2
index bf70ab892e69..fbcbf55ce744 100644
@@ -500,7 +500,7 @@ static int hwsim_del_edge_nl(struct sk_buff *msg, struct genl_info *info)
 	    !info->attrs[MAC802154_HWSIM_ATTR_RADIO_EDGE])
 		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],
 			     hwsim_edge_policy, NULL))
 		return -EINVAL;

@@ -543,6 +543,7 @@ static int hwsim_set_edge_lqi(struct sk_buff *msg, struct genl_info *info)
 	struct hwsim_edge_info *einfo;
 	struct hwsim_phy *phy_v0;
 	struct hwsim_edge *e;
+
 	u32 v0, v1;
 	u8 lqi;
 

@@ -550,7 +551,7 @@ static int hwsim_set_edge_lqi(struct sk_buff *msg, struct genl_info *info)
 	    !info->attrs[MAC802154_HWSIM_ATTR_RADIO_EDGE])
 		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],
 			     hwsim_edge_policy, NULL))
 		return -EINVAL;
Signature · 1 line
2.11.0
author
#1 lore raw
Quoted 25 lines · Alexander Aring

This patch fixes a off-by-one mistake in nla_parse_nested() functions of mac802154_hwsim driver. I had to enabled stack protector so I was able to reproduce it.

Reference: https://github.com/linux-wpan/wpan-tools/issues/17

Signed-off-by Alexander Aring <[email protected]>
---
 drivers/net/ieee802154/mac802154_hwsim.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/net/ieee802154/mac802154_hwsim.c +1 -1
index bf70ab892e69..fbcbf55ce744 100644
@@ -500,7 +500,7 @@ static int hwsim_del_edge_nl(struct sk_buff *msg, struct genl_info *info)
 	    !info->attrs[MAC802154_HWSIM_ATTR_RADIO_EDGE])
 		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],
 			     hwsim_edge_policy, NULL))
 		return -EINVAL;

drivers/net/ieee802154/mac802154_hwsim.c static int hwsim_set_edge_lqi(struct sk_buff *msg, struct genl_info *info) · line 546

Quoted 4 lines
drivers/net/ieee802154/mac802154_hwsim.c +1 -0
@@ -543,6 +543,7 @@ static int hwsim_set_edge_lqi(struct sk_buff *msg, struct genl_info *info)
 	struct hwsim_edge_info *einfo;
 	struct hwsim_phy *phy_v0;
 	struct hwsim_edge *e;
+

grml, I will fix that...

- Alex