diff options
| -rw-r--r-- | packet.h | 4 | ||||
| -rw-r--r-- | tcp.c | 10 |
2 files changed, 10 insertions, 4 deletions
@@ -40,10 +40,10 @@ void *packet_get_do(const struct pool *p, const size_t index, void pool_flush(struct pool *p); #define packet_add(p, len, start) \ - packet_add_do(p, len, start, __func__, __LINE__); + packet_add_do(p, len, start, __func__, __LINE__) #define packet_get(p, index, offset, len, left) \ - packet_get_do(p, index, offset, len, left, __func__, __LINE__); + packet_get_do(p, index, offset, len, left, __func__, __LINE__) #define packet_get_try(p, index, offset, len, left) \ packet_get_do(p, index, offset, len, left, NULL, 0) @@ -2505,7 +2505,11 @@ static void tcp_data_from_tap(struct ctx *c, struct tcp_conn *conn, char *data; size_t off; - packet_get(p, i, 0, 0, &len); + if (!packet_get(p, i, 0, 0, &len)) { + tcp_rst(c, conn); + return; + } + th = packet_get(p, i, 0, sizeof(*th), NULL); if (!th) { tcp_rst(c, conn); @@ -2729,7 +2733,9 @@ int tcp_tap_handler(struct ctx *c, int af, const void *addr, int ack_due = 0; char *opts; - packet_get(p, 0, 0, 0, &len); + if (!packet_get(p, 0, 0, 0, &len)) + return 1; + th = packet_get(p, 0, 0, sizeof(*th), NULL); if (!th) return 1; |