d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify g_disk_ident_adjust() function and allow any printable character

Browse Source 
in serial number.

Discussed with:	trasz
Obtained from:	Wheel Sp. z o.o. (http://www.wheel.pl)
This commit is contained in:
pjd 2009-09-04 09:39:06 +00:00
parent e49c4b7112
commit 39353b796a
1 changed files with 14 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
sys/geom/geom_disk.c
View File

@ -44,6 +44,7 @@ __FBSDID("$FreeBSD$");
#include <sys/sysctl.h>
#include <sys/bio.h>
#include <sys/conf.h>
#include <sys/ctype.h>
#include <sys/fcntl.h>
#include <sys/malloc.h>
#include <sys/sysctl.h>
@ -400,39 +401,25 @@ g_disk_destroy(void *ptr, int flag)
}
/*
* We only allow [a-zA-Z0-9-_@#%.:] characters, the rest is converted to 'x<HH>'.
* We only allow printable characters in disk ident,
* the rest is converted to 'x<HH>'.
*/
static void
g_disk_ident_adjust(char *ident, size_t size)
{
char newid[DISK_IDENT_SIZE], tmp[4];
size_t len;
char *p;
char *p, tmp[4], newid[DISK_IDENT_SIZE];
bzero(newid, sizeof(newid));
len = 0;
for (p = ident; *p != '\0' && len < sizeof(newid) - 1; p++) {
switch (*p) {
default:
if ((*p < 'a' || *p > 'z') &&
(*p < 'A' || *p > 'Z') &&
(*p < '0' || *p > '9')) {
snprintf(tmp, sizeof(tmp), "x%02hhx", *p);
strlcat(newid, tmp, sizeof(newid));
len += 3;
break;
}
/* FALLTHROUGH */
case '-':
case '_':
case '@':
case '#':
case '%':
case '.':
case ':':
newid[len++] = *p;
break;
newid[0] = '\0';
for (p = ident; *p != '\0'; p++) {
if (isprint(*p)) {
tmp[0] = *p;
tmp[1] = '\0';
} else {
snprintf(tmp, sizeof(tmp), "x%02hhx",
*(unsigned char *)p);
}
if (strlcat(newid, tmp, sizeof(newid)) >= sizeof(newid))
break;
}
bzero(ident, size);
strlcpy(ident, newid, size);