aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLorenzo Colitti <lorenzo@google.com>2014-09-03 21:44:27 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-09-03 21:44:27 +0000
commit822a5c622d4909cf7aeb618856a05829d865d4a9 (patch)
treebef2914f25c2013c02d8c32b063d6b8268d5042d
parente8ef8a0962dfd5d4cc0c2a45e5ea30042ee11843 (diff)
parent371e319488e62475a4185a93bf47580860268561 (diff)
downloadandroid_external_dhcpcd-822a5c622d4909cf7aeb618856a05829d865d4a9.tar.gz
android_external_dhcpcd-822a5c622d4909cf7aeb618856a05829d865d4a9.tar.bz2
android_external_dhcpcd-822a5c622d4909cf7aeb618856a05829d865d4a9.zip
Merge "Fix DoS vulnerability in DHO_OPTIONSOVERLOADED."
-rw-r--r--dhcp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/dhcp.c b/dhcp.c
index c22e767..53f4795 100644
--- a/dhcp.c
+++ b/dhcp.c
@@ -352,7 +352,7 @@ get_option(const struct dhcp_message *dhcp, uint8_t opt, int *len, int *type)
case DHO_OPTIONSOVERLOADED:
/* Ensure we only get this option once */
if (!overl)
- overl = p[1];
+ overl = 0x80 | p[1];
break;
}
l = *p++;