lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wireless: escape_ssid should handle non-printables

Browse Source 
Also use common backslash sequences like \t, \n, \r, and \\ as well as \0.

Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
John W. Linville
2008-09-30 17:50:31 -04:00
parent c5d3dce875
commit 2819f8ad6d
1 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
net/wireless/lib80211.c
View File

@@ -6,6 +6,7 @@
*/ */
#include <linux/module.h> #include <linux/module.h>
#include <linux/ctype.h>
#include <linux/ieee80211.h> #include <linux/ieee80211.h>
#include <net/lib80211.h> #include <net/lib80211.h>
@@ -20,19 +21,31 @@ MODULE_LICENSE("GPL");
const char *escape_ssid(const char *ssid, u8 ssid_len) 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; const char *s = ssid;
char *d = escaped; char *d = escaped;
ssid_len = min_t(u8, ssid_len, IEEE80211_MAX_SSID_LEN); ssid_len = min_t(u8, ssid_len, IEEE80211_MAX_SSID_LEN);
while (ssid_len--) { while (ssid_len--) {
if (*s == '\0') { if (isprint(*s)) {
*d++ = '\\';
*d++ = '0';
s++;
} else {
*d++ = *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'; *d = '\0';
return escaped; return escaped;