diff options
| author | John W. Linville <linville@tuxdriver.com> | 2008-09-30 17:50:31 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2008-10-31 19:00:49 -0400 |
| commit | 2819f8ad6da1e24b5dd94a221978e61f2a9c972a (patch) | |
| tree | d2bd598b6a6e9029fb7399571826e6b2cdef2d0a | |
| parent | c5d3dce875ef055ed9b14f169cc967cc2c8faf1f (diff) | |
wireless: escape_ssid should handle non-printables
Also use common backslash sequences like \t, \n, \r, and \\ as well as \0.
Signed-off-by: John W. Linville <linville@tuxdriver.com>
| -rw-r--r-- | net/wireless/lib80211.c | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/net/wireless/lib80211.c b/net/wireless/lib80211.c index 872cc8dc00a..b8e34d31e75 100644 --- a/net/wireless/lib80211.c +++ b/net/wireless/lib80211.c @@ -6,6 +6,7 @@ */ #include <linux/module.h> +#include <linux/ctype.h> #include <linux/ieee80211.h> #include <net/lib80211.h> @@ -20,19 +21,31 @@ MODULE_LICENSE("GPL"); const char *escape_ssid(const char *ssid, u8 ssid_len) { - static char escaped[IEEE80211_MAX_SSID_LEN * 2 + 1]; + static char escaped[IEEE80211_MAX_SSID_LEN * 4 + 1]; const char *s = ssid; char *d = escaped; ssid_len = min_t(u8, ssid_len, IEEE80211_MAX_SSID_LEN); while (ssid_len--) { - if (*s == '\0') { - *d++ = '\\'; - *d++ = '0'; - s++; - } else { + if (isprint(*s)) { *d++ = *s++; + continue; } + + *d++ = '\\'; + if (*s == '\0') + *d++ = '0'; + else if (*s == '\n') + *d++ = 'n'; + else if (*s == '\r') + *d++ = 'r'; + else if (*s == '\t') + *d++ = 't'; + else if (*s == '\\') + *d++ = '\\'; + else + d += snprintf(d, 3, "%03o", *s); + s++; } *d = '\0'; return escaped; |