|
 |
46a5309 |
From 907070918d5e81a515315b395f334e52589fe0fb Mon Sep 17 00:00:00 2001
|
|
|
46a5309 |
From: Guy Harris <guy@alum.mit.edu>
|
|
|
46a5309 |
Date: Wed, 18 Dec 2019 15:06:53 -0800
|
|
|
46a5309 |
Subject: [PATCH] Check for invalid IPv4 addresses.
|
|
|
46a5309 |
|
|
|
46a5309 |
This should fix GitHub issue #893.
|
|
|
46a5309 |
---
|
|
|
46a5309 |
gencode.c | 9 ++++++++-
|
|
|
46a5309 |
nametoaddr.c | 9 ++++++++-
|
|
|
46a5309 |
2 files changed, 16 insertions(+), 2 deletions(-)
|
|
|
46a5309 |
|
|
|
46a5309 |
diff --git a/gencode.c b/gencode.c
|
|
|
46a5309 |
index bdc35e646..040a55315 100644
|
|
|
46a5309 |
--- a/gencode.c
|
|
|
46a5309 |
+++ b/gencode.c
|
|
|
46a5309 |
@@ -6947,11 +6947,15 @@ gen_mcode(compiler_state_t *cstate, const char *s1, const char *s2,
|
|
|
46a5309 |
return (NULL);
|
|
|
46a5309 |
|
|
|
46a5309 |
nlen = __pcap_atoin(s1, &n);
|
|
|
46a5309 |
+ if (nlen < 0)
|
|
|
46a5309 |
+ bpf_error(cstate, "invalid IPv4 address '%s'", s1);
|
|
|
46a5309 |
/* Promote short ipaddr */
|
|
|
46a5309 |
n <<= 32 - nlen;
|
|
|
46a5309 |
|
|
|
46a5309 |
if (s2 != NULL) {
|
|
|
46a5309 |
mlen = __pcap_atoin(s2, &m);
|
|
|
46a5309 |
+ if (mlen < 0)
|
|
|
46a5309 |
+ bpf_error(cstate, "invalid IPv4 address '%s'", s2);
|
|
|
46a5309 |
/* Promote short ipaddr */
|
|
|
46a5309 |
m <<= 32 - mlen;
|
|
|
46a5309 |
if ((n & ~m) != 0)
|
|
|
46a5309 |
@@ -7009,8 +7013,11 @@ gen_ncode(compiler_state_t *cstate, const char *s, bpf_u_int32 v, struct qual q)
|
|
|
46a5309 |
vlen = __pcap_atodn(s, &v);
|
|
|
46a5309 |
if (vlen == 0)
|
|
|
46a5309 |
bpf_error(cstate, "malformed decnet address '%s'", s);
|
|
|
46a5309 |
- } else
|
|
|
46a5309 |
+ } else {
|
|
|
46a5309 |
vlen = __pcap_atoin(s, &v);
|
|
|
46a5309 |
+ if (vlen < 0)
|
|
|
46a5309 |
+ bpf_error(cstate, "invalid IPv4 address '%s'", s);
|
|
|
46a5309 |
+ }
|
|
|
46a5309 |
|
|
|
46a5309 |
switch (q.addr) {
|
|
|
46a5309 |
|
|
|
46a5309 |
diff --git a/nametoaddr.c b/nametoaddr.c
|
|
|
46a5309 |
index 53070a285..13bf4c683 100644
|
|
|
46a5309 |
--- a/nametoaddr.c
|
|
|
46a5309 |
+++ b/nametoaddr.c
|
|
|
46a5309 |
@@ -674,8 +674,15 @@ __pcap_atoin(const char *s, bpf_u_int32 *addr)
|
|
|
46a5309 |
len = 0;
|
|
|
46a5309 |
for (;;) {
|
|
|
46a5309 |
n = 0;
|
|
|
46a5309 |
- while (*s && *s != '.')
|
|
|
46a5309 |
+ while (*s && *s != '.') {
|
|
|
46a5309 |
+ if (n > 25) {
|
|
|
46a5309 |
+ /* The result will be > 255 */
|
|
|
46a5309 |
+ return -1;
|
|
|
46a5309 |
+ }
|
|
|
46a5309 |
n = n * 10 + *s++ - '0';
|
|
|
46a5309 |
+ }
|
|
|
46a5309 |
+ if (n > 255)
|
|
|
46a5309 |
+ return -1;
|
|
|
46a5309 |
*addr <<= 8;
|
|
|
46a5309 |
*addr |= n & 0xff;
|
|
|
46a5309 |
len += 8;
|