emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

udhcpc: do in fact not allow hostname components which start with dash

Browse Source 
function                                             old     new   delta
xmalloc_optname_optval                               879     893     +14

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko
2018-08-01 13:16:05 +02:00
parent 3550bc494d
commit 48ec979ed1
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
networking/udhcp/dhcpc.c
View File

@@ -160,8 +160,8 @@ static int mton(uint32_t mask)
#if ENABLE_FEATURE_UDHCPC_SANITIZEOPT #if ENABLE_FEATURE_UDHCPC_SANITIZEOPT
/* Check if a given label represents a valid DNS label /* Check if a given label represents a valid DNS label
* Return pointer to the first character after the label upon success, * Return pointer to the first character after the label
* NULL otherwise. * (NUL or dot) upon success, NULL otherwise.
* See RFC1035, 2.3.1 * See RFC1035, 2.3.1
*/ */
/* We don't need to be particularly anal. For example, allowing _, hyphen /* We don't need to be particularly anal. For example, allowing _, hyphen
@@ -173,8 +173,10 @@ static int mton(uint32_t mask)
static const char *valid_domain_label(const char *label) static const char *valid_domain_label(const char *label)
{ {
unsigned char ch; unsigned char ch;
unsigned pos = 0; //unsigned pos = 0;
if (label[0] == '-')
return NULL;
for (;;) { for (;;) {
ch = *label; ch = *label;
if ((ch|0x20) < 'a' || (ch|0x20) > 'z') { if ((ch|0x20) < 'a' || (ch|0x20) > 'z') {
@@ -187,7 +189,7 @@ static const char *valid_domain_label(const char *label)
} }
} }
label++; label++;
pos++; //pos++;
//Do we want this? //Do we want this?
//if (pos > 63) /* NS_MAXLABEL; labels must be 63 chars or less */ //if (pos > 63) /* NS_MAXLABEL; labels must be 63 chars or less */
// return NULL; // return NULL;