diff options
| author | Angelos D. Keromytis <angelos@cvs.openbsd.org> | 2000-09-19 03:41:12 +0000 |
|---|---|---|
| committer | Angelos D. Keromytis <angelos@cvs.openbsd.org> | 2000-09-19 03:41:12 +0000 |
| commit | 1bc49feb9d0b14608e89e8d31800a6b17dcfc4f9 (patch) | |
| tree | 40a24a33c8ffd2405ee363f20a517ed54ffc4a40 | |
| parent | 4ed181a5436814b40df991c2c9962cdba6887334 (diff) | |
Better cleanup on invalid ADDFLOW message.
| -rw-r--r-- | sys/net/pfkeyv2.c | 49 |
1 files changed, 26 insertions, 23 deletions
diff --git a/sys/net/pfkeyv2.c b/sys/net/pfkeyv2.c index d89afc980d9..536ec44dd7a 100644 --- a/sys/net/pfkeyv2.c +++ b/sys/net/pfkeyv2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pfkeyv2.c,v 1.39 2000/09/19 03:19:39 angelos Exp $ */ +/* $OpenBSD: pfkeyv2.c,v 1.40 2000/09/19 03:41:11 angelos Exp $ */ /* %%% copyright-nrl-97 This software is Copyright 1997-1998 by Randall Atkinson, Ronald Lee, @@ -1609,6 +1609,8 @@ pfkeyv2_send(struct socket *socket, void *message, int len) SADB_GETSPROTO(smsg->sadb_msg_satype)); if (ipo->ipo_tdb == NULL) { + if (!exists) + FREE(ipo, M_TDB); ipo->ipo_tdb = ktdb; /* Reset */ rval = ESRCH; goto splxret; @@ -1624,27 +1626,6 @@ pfkeyv2_send(struct socket *socket, void *message, int len) splx(s); } - if (sunionp) - bcopy(sunionp, &ipo->ipo_dst, sizeof(union sockaddr_union)); - else - { - bzero(&ipo->ipo_dst, sizeof(union sockaddr_union)); - ipo->ipo_dst.sa.sa_family = src->sa.sa_family; - ipo->ipo_dst.sa.sa_len = src->sa.sa_len; - } - - if (ssrc) - bcopy(ssrc, &ipo->ipo_src, sizeof(union sockaddr_union)); - else - { - bzero(&ipo->ipo_src, sizeof(union sockaddr_union)); - ipo->ipo_src.sa.sa_family = src->sa.sa_family; - ipo->ipo_src.sa.sa_len = src->sa.sa_len; - } - - ipo->ipo_sproto = SADB_GETSPROTO(smsg->sadb_msg_satype); - - /* Flow type */ switch (((struct sadb_protocol *) headers[SADB_X_EXT_FLOW_TYPE])->sadb_protocol_proto) { case FLOW_X_TYPE_USE: @@ -1672,11 +1653,33 @@ pfkeyv2_send(struct socket *socket, void *message, int len) break; default: - FREE(ipo, M_TDB); + if (!exists) + FREE(ipo, M_TDB); rval = EINVAL; goto ret; } + if (sunionp) + bcopy(sunionp, &ipo->ipo_dst, sizeof(union sockaddr_union)); + else + { + bzero(&ipo->ipo_dst, sizeof(union sockaddr_union)); + ipo->ipo_dst.sa.sa_family = src->sa.sa_family; + ipo->ipo_dst.sa.sa_len = src->sa.sa_len; + } + + if (ssrc) + bcopy(ssrc, &ipo->ipo_src, sizeof(union sockaddr_union)); + else + { + bzero(&ipo->ipo_src, sizeof(union sockaddr_union)); + ipo->ipo_src.sa.sa_family = src->sa.sa_family; + ipo->ipo_src.sa.sa_len = src->sa.sa_len; + } + + ipo->ipo_sproto = SADB_GETSPROTO(smsg->sadb_msg_satype); + + /* Flow type */ if (!exists) { /* Add SPD entry */ |