Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ieee802154: fix faulty check in set_phy_params api

Browse source 
phy_set_csma_params has a redundant (and impossible) check for
"retries", found by smatch. The check was supposed to be for
frame_retries, but wasn't moved during development when
phy_set_frame_retries was introduced. Also, maxBE >= 3 as required by
the standard is not enforced.

Remove the redundant check, assure max_be >= 3 and check -1 <=
frame_retries <= 7 in the correct function.

Signed-off-by: Phoebe Buckheister <phoebe.buckheister@itwm.fraunhofer.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Phoebe Buckheister 2014-02-18 14:39:27 +01:00 committed by David S. Miller
parent 9e5f040d0f
commit 1c8272bd18
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
net/ieee802154/nl-phy.c
View file

@ -436,8 +436,7 @@ static int phy_set_csma_params(struct wpan_phy *phy, struct genl_info *info)
if (info->attrs[IEEE802154_ATTR_CSMA_MAX_BE]) if (info->attrs[IEEE802154_ATTR_CSMA_MAX_BE])
max_be = nla_get_u8(info->attrs[IEEE802154_ATTR_CSMA_MAX_BE]); max_be = nla_get_u8(info->attrs[IEEE802154_ATTR_CSMA_MAX_BE]);
if (retries > 5 || max_be > 8 || min_be > max_be || if (retries > 5 || max_be < 3 || max_be > 8 || min_be > max_be)
retries < -1 || retries > 7)
return -EINVAL; return -EINVAL;
rc = phy->set_csma_params(phy, min_be, max_be, retries); rc = phy->set_csma_params(phy, min_be, max_be, retries);
@ -456,6 +455,9 @@ static int phy_set_frame_retries(struct wpan_phy *phy, struct genl_info *info)
s8 retries = nla_get_s8(info->attrs[IEEE802154_ATTR_FRAME_RETRIES]); s8 retries = nla_get_s8(info->attrs[IEEE802154_ATTR_FRAME_RETRIES]);
int rc; int rc;
if (retries < -1 || retries > 7)
return -EINVAL;
rc = phy->set_frame_retries(phy, retries); rc = phy->set_frame_retries(phy, retries);
if (rc < 0) if (rc < 0)
return rc; return rc;