wifi: cfg80211: don't allow negative key_len values
Subsystems (2)
PATCH 1/1 wifi: cfg80211: don't allow negative key_len values
The ath6kl_cfg80211_add_key() function has an upper bounds check on params->key_len which ensures that it can't go over WLAN_MAX_KEY_LEN but it doesn't check for negatives. This could potentially lead to memory corruption.
Put a bounds check on negative values in cfg80211_validate_key_settings() to prevent this sort of bug in the future.
---
This is from static analysis. I can't think why a driver would ever want a negative length and I think this is the safest solution. But I have not tested it.
net/wireless/util.c | 2 ++ 1 file changed, 2 insertions(+)
net/wireless/util.c +2 -0
@@ -397,6 +397,8 @@ int cfg80211_validate_key_settings(struct cfg80211_registered_device *rdev,* or not the driver supports this algorithm, * of course. */ +if (params->key_len <0 ) +return -EINVAL ;break ; }
Signature · 1 line
2.53.0
Johannes Berg
maintainerQuoted 7 lines · Dan Carpenter
The
ath6kl_cfg80211_add_key()function has an upper bounds check onparams->key_lenwhich ensures that it can't go overWLAN_MAX_KEY_LENbut it doesn't check for negatives. This could potentially lead to memory corruption.Put a bounds check on negative values in
cfg80211_validate_key_settings()to prevent this sort of bug in the future.
Clearly this commit doesn't seem problematic, but I'm not sure I see the path to it mattering? The key_len should only ever be set by wext/nl80211, and that can't really end up with a negative length?
We should probably just make it a u8 there, no way it's ever bigger than that, but I'm not seeing through why this would matter much right now.
johannes
Quoted 9 lines · Johannes Berg
Quoted 7 lines · Dan Carpenter
The
ath6kl_cfg80211_add_key()function has an upper bounds check onparams->key_lenwhich ensures that it can't go overWLAN_MAX_KEY_LENbut it doesn't check for negatives. This could potentially lead to memory corruption.Put a bounds check on negative values in
cfg80211_validate_key_settings()to prevent this sort of bug in the future.
Quoted 6 lines
Clearly this commit doesn't seem problematic, but I'm not sure I see the path to it mattering? The
key_lenshould only ever be set by wext/nl80211, and that can't really end up with a negative length?We should probably just make it a u8 there, no way it's ever bigger than that, but I'm not seeing through why this would matter much right now.
Ah. Yeah. You're right. :/ Sorry for the noise.
regards,
dan carpenter