* [PATCH] Wireless: Make cfg80211_dev_rename() check sscanf return value in net/wireless/core.c
@ 2010-03-20 4:53 wzt.wzt
2010-03-20 7:39 ` Johannes Berg
0 siblings, 1 reply; 2+ messages in thread
From: wzt.wzt @ 2010-03-20 4:53 UTC (permalink / raw)
To: linux-kernel; +Cc: linux-wireless, flamingice
Make cfg80211_dev_rename() check sscanf return value.
Signed-off-by: Zhitong Wang <zhitong.wangzt@alibaba-inc.com>
---
net/wireless/core.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/net/wireless/core.c b/net/wireless/core.c
index 80afacd..8e815b4 100644
--- a/net/wireless/core.c
+++ b/net/wireless/core.c
@@ -146,7 +146,9 @@ int cfg80211_dev_rename(struct cfg80211_registered_device *rdev,
int idx, taken = -1, result, digits;
/* prohibit calling the thing phy%d when %d is not its number */
- sscanf(newname, PHY_NAME "%d%n", &idx, &taken);
+ if (sscanf(newname, PHY_NAME "%d%n", &idx, &taken) != 2)
+ return -EINVAL;
+
if (taken == strlen(newname) && idx != rdev->idx) {
/* count number of places needed to print idx */
digits = 1;
--
1.6.5.3
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] Wireless: Make cfg80211_dev_rename() check sscanf return value in net/wireless/core.c
2010-03-20 4:53 [PATCH] Wireless: Make cfg80211_dev_rename() check sscanf return value in net/wireless/core.c wzt.wzt
@ 2010-03-20 7:39 ` Johannes Berg
0 siblings, 0 replies; 2+ messages in thread
From: Johannes Berg @ 2010-03-20 7:39 UTC (permalink / raw)
To: wzt.wzt; +Cc: linux-kernel, linux-wireless, flamingice
On Sat, 2010-03-20 at 12:53 +0800, wzt.wzt@gmail.com wrote:
> Make cfg80211_dev_rename() check sscanf return value.
>
> Signed-off-by: Zhitong Wang <zhitong.wangzt@alibaba-inc.com>
>
> ---
> net/wireless/core.c | 4 +++-
> 1 files changed, 3 insertions(+), 1 deletions(-)
>
> diff --git a/net/wireless/core.c b/net/wireless/core.c
> index 80afacd..8e815b4 100644
> --- a/net/wireless/core.c
> +++ b/net/wireless/core.c
> @@ -146,7 +146,9 @@ int cfg80211_dev_rename(struct cfg80211_registered_device *rdev,
> int idx, taken = -1, result, digits;
>
> /* prohibit calling the thing phy%d when %d is not its number */
> - sscanf(newname, PHY_NAME "%d%n", &idx, &taken);
> + if (sscanf(newname, PHY_NAME "%d%n", &idx, &taken) != 2)
> + return -EINVAL;
> +
Umm, no, your patch breaks it completely. Look at the logic again.
johannes
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-03-20 7:42 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-03-20 4:53 [PATCH] Wireless: Make cfg80211_dev_rename() check sscanf return value in net/wireless/core.c wzt.wzt
2010-03-20 7:39 ` Johannes Berg
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox