diff options
| author |   deraadt <deraadt@openbsd.org> | 2014-01-08 02:39:02 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2014-01-08 02:39:02 +0000 |
| commit | acb84fced2b5270bfefc21d8db51fedebf72f894 (patch) | |
| tree | 3eeb906906263bdcde29260d31b872972adf871f | |
| parent | Make skipping the root fs DUID aware. (diff) | |
| download | wireguard-openbsd-acb84fced2b5270bfefc21d8db51fedebf72f894.tar.xz wireguard-openbsd-acb84fced2b5270bfefc21d8db51fedebf72f894.zip | |
Perform manual malloc/free of a large object in pfkeyv2_send() to
reduce stack space requirements.
ok mikeb mpi
| -rw-r--r-- | sys/net/pfkeyv2.c | 31 |
1 files changed, 19 insertions, 12 deletions
diff --git a/sys/net/pfkeyv2.c b/sys/net/pfkeyv2.c index 3cdd65201fb..c6554cbd612 100644 --- a/sys/net/pfkeyv2.c +++ b/sys/net/pfkeyv2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pfkeyv2.c,v 1.131 2013/08/21 05:21:46 dlg Exp $ */ +/* $OpenBSD: pfkeyv2.c,v 1.132 2014/01/08 02:39:02 deraadt Exp $ */ /* * @(#)COPYRIGHT 1.1 (NRL) 17 January 1995 @@ -860,7 +860,7 @@ pfkeyv2_send(struct socket *socket, void *message, int len) union sockaddr_union *sunionp; - struct tdb sa, *sa2 = NULL; + struct tdb *sa1 = NULL, *sa2 = NULL; struct sadb_msg *smsg; struct sadb_spirange *sprng; @@ -933,24 +933,28 @@ pfkeyv2_send(struct socket *socket, void *message, int len) smsg = (struct sadb_msg *) headers[0]; switch (smsg->sadb_msg_type) { case SADB_GETSPI: /* Reserve an SPI */ - bzero(&sa, sizeof(struct tdb)); + sa1 = malloc(sizeof (*sa1), M_PFKEY, M_NOWAIT | M_ZERO); + if (sa1 == NULL) { + rval = ENOMEM; + goto ret; + } - sa.tdb_satype = smsg->sadb_msg_satype; - if ((rval = pfkeyv2_get_proto_alg(sa.tdb_satype, - &sa.tdb_sproto, 0))) + sa1->tdb_satype = smsg->sadb_msg_satype; + if ((rval = pfkeyv2_get_proto_alg(sa1->tdb_satype, + &sa1->tdb_sproto, 0))) goto ret; - import_address((struct sockaddr *) &sa.tdb_src, + import_address((struct sockaddr *) &sa1->tdb_src, headers[SADB_EXT_ADDRESS_SRC]); - import_address((struct sockaddr *) &sa.tdb_dst, + import_address((struct sockaddr *) &sa1->tdb_dst, headers[SADB_EXT_ADDRESS_DST]); /* Find an unused SA identifier */ sprng = (struct sadb_spirange *) headers[SADB_EXT_SPIRANGE]; - sa.tdb_spi = reserve_spi(rdomain, + sa1->tdb_spi = reserve_spi(rdomain, sprng->sadb_spirange_min, sprng->sadb_spirange_max, - &sa.tdb_src, &sa.tdb_dst, sa.tdb_sproto, &rval); - if (sa.tdb_spi == 0) + &sa1->tdb_src, &sa1->tdb_dst, sa1->tdb_sproto, &rval); + if (sa1->tdb_spi == 0) goto ret; /* Send a message back telling what the SA (the SPI really) is */ @@ -965,7 +969,7 @@ pfkeyv2_send(struct socket *socket, void *message, int len) bckptr = freeme; /* We really only care about the SPI, but we'll export the SA */ - export_sa((void **) &bckptr, &sa); + export_sa((void **) &bckptr, sa1); break; case SADB_UPDATE: @@ -1873,6 +1877,9 @@ realret: explicit_bzero(message, len); free(message, M_PFKEY); + if (sa1) + free(sa1, M_PFKEY); + return (rval); splxret: |