wireless: test sscanf return values
Subsystems (4)
PATCH 1/1 wireless: test sscanf return values
At some point, it'd be good to make sscanf use __must_check so make sure the net/ uses of sscanf use the return value.
---
Compiled, untested.
net/mac80211/debugfs.c | 4 ++-- net/wireless/core.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
net/mac80211/debugfs.c +2 -2
@@ -160,9 +160,9 @@ static ssize_t sta_tx_latency_stat_write(struct file *file, tx_latency->n_ranges = n_ranges;for (i =0 ; i < n_ranges; i++) {/* setting bin ranges */ token =strsep (&bins,TX_LATENCY_BIN_DELIMTER_S ); -sscanf (token,"%d" , &tx_latency->ranges[i]);/* bins values should be in ascending order */ -if (prev_bin >= tx_latency->ranges[i]) { +if (sscanf (token,"%d" , &tx_latency->ranges[i]) !=1 || + prev_bin >= tx_latency->ranges[i]) { ret = -EINVAL ;kfree (tx_latency); goto unlock;
net/wireless/core.c +2 -2
@@ -95,8 +95,8 @@ static int cfg80211_dev_check_name(struct cfg80211_registered_device *rdev,ASSERT_RTNL ();/* prohibit calling the thing phy%d when %d is not its number */ -sscanf (newname,PHY_NAME "%d%n" , &wiphy_idx, &taken); -if (taken ==strlen (newname) && wiphy_idx != rdev->wiphy_idx) { +if (sscanf (newname,PHY_NAME "%d%n" , &wiphy_idx, &taken) ==1 && + taken ==strlen (newname) && wiphy_idx != rdev->wiphy_idx) {/* count number of places needed to print wiphy_idx */ digits =1 ;while (wiphy_idx /=10 )
From: Joe Perches
Quoted 2 lines
At some point, it'd be good to make sscanf use
__must_checkso make sure thenet/uses of sscanf use the return value.
Isn't it much safer to avoid sscanf() completely and use a different function for converting numerics?
David
Quoted 6 lines · David Laight
From: Joe Perches
Quoted 2 lines
At some point, it'd be good to make sscanf use
__must_checkso make sure thenet/uses of sscanf use the return value.Isn't it much safer to avoid
sscanf()completely and use a different function for converting numerics?
It's generally better to use something other than sscanf. That doesn't mean sscanf isn't useful.