diff options
author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1998-11-25 02:01:29 +0000 |
---|---|---|
committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1998-11-25 02:01:29 +0000 |
commit | df0457dc198642163b2ac78650e8a965f86aae27 (patch) | |
tree | 0377953b1f02bbe170d979bfd6f03702aaca03a9 /sys/netinet/ip_esp_old.c | |
parent | 9eace93090ecd5af22f4c9832c2e581cca6fd70f (diff) |
Add checks of packets getting to big after transforms.
Also make sure some more error conditions get told to the caller.
Diffstat (limited to 'sys/netinet/ip_esp_old.c')
-rw-r--r-- | sys/netinet/ip_esp_old.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/sys/netinet/ip_esp_old.c b/sys/netinet/ip_esp_old.c index f93d89259cf..02f80af4678 100644 --- a/sys/netinet/ip_esp_old.c +++ b/sys/netinet/ip_esp_old.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_esp_old.c,v 1.20 1998/07/30 08:41:21 provos Exp $ */ +/* $OpenBSD: ip_esp_old.c,v 1.21 1998/11/25 02:01:27 niklas Exp $ */ /* * The authors of this code are John Ioannidis (ji@tla.org), @@ -624,8 +624,18 @@ esp_old_output(struct mbuf *m, struct sockaddr_encap *gw, struct tdb *tdb, ipo = *ip; nh = ipo.ip_p; - rlen = ilen - iphlen; /* raw payload length */ + /* Raw payload length */ + rlen = ilen - iphlen; padding = ((blks - ((rlen + 2) % blks)) % blks) + 2; + if (iphlen + ohlen + rlen + padding > IP_MAXPACKET) { + if (encdebug) + log(LOG_ALERT, + "esp_old_output(): packet in SA %x/%0x8 got too big\n", + tdb->tdb_dst, ntohl(tdb->tdb_spi)); + m_freem(m); + espstat.esps_toobig++; + return ENOBUFS; + } pad = (u_char *) m_pad(m, padding); if (pad == NULL) |