Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1c8272bd authored by Phoebe Buckheister's avatar Phoebe Buckheister Committed by David S. Miller
Browse files

ieee802154: fix faulty check in set_phy_params api 



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: default avatarPhoebe Buckheister <phoebe.buckheister@itwm.fraunhofer.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9e5f040d

net/ieee802154/nl-phy.c

+4 −2
Original line number Diff line number Diff line
@@ -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])

		max_be = nla_get_u8(info->attrs[IEEE802154_ATTR_CSMA_MAX_BE]);



	if (retries > 5 || max_be > 8 || min_be > max_be ||

	    retries < -1 || retries > 7)

	if (retries > 5 || max_be < 3 || max_be > 8 || min_be > max_be)

		return -EINVAL;



	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]);

	int rc;



	if (retries < -1 || retries > 7)

		return -EINVAL;



	rc = phy->set_frame_retries(phy, retries);

	if (rc < 0)

		return rc;