diff options
author | itojun <itojun@FreeBSD.org> | 1998-03-23 14:49:12 +0000 |
---|---|---|
committer | itojun <itojun@FreeBSD.org> | 1998-03-23 14:49:12 +0000 |
commit | 2b902492892bddd3ebb53c5c41dab92bdb4229dd (patch) | |
tree | bd7dd6cb14535ee32efbe3c9c1fd54b5c0cb3177 /sys/netkey | |
parent | d3106031d177d3ede26e50052f67e4823c879882 (diff) | |
download | FreeBSD-src-2b902492892bddd3ebb53c5c41dab92bdb4229dd.zip FreeBSD-src-2b902492892bddd3ebb53c5c41dab92bdb4229dd.tar.gz |
key_getspi() bugfix.
Submitted by: k-sugyou@ccs.mt.nec.co.jp
Diffstat (limited to 'sys/netkey')
-rw-r--r-- | sys/netkey/key.c | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/sys/netkey/key.c b/sys/netkey/key.c index d92fd12..75754ac 100644 --- a/sys/netkey/key.c +++ b/sys/netkey/key.c @@ -1214,17 +1214,33 @@ key_getspi(type, vers, src, dst, lowval, highval, spi) secassoc->vers = vers; secassoc->spi = val; secassoc->state |= K_LARVAL; - if (my_addr(secassoc->dst)) + if (my_addr(dst)) secassoc->state |= K_INBOUND; - if (my_addr(secassoc->src)) + if (my_addr(src)) secassoc->state |= K_OUTBOUND; + KMALLOC(secassoc->src, struct sockaddr *, src->sa_len); + if (!secassoc->src) { + DPRINTF(IDL_ERROR,("key_getspi: can't allocate memory\n")); + KFREE(secassoc); + CRITICAL_END; + return(ENOBUFS); + } bcopy((char *)src, (char *)secassoc->src, src->sa_len); + KMALLOC(secassoc->dst, struct sockaddr *, dst->sa_len); + if (!secassoc->dst) { + DPRINTF(IDL_ERROR,("key_getspi: can't allocate memory\n")); + KFREE(secassoc->src); + KFREE(secassoc); + CRITICAL_END; + return(ENOBUFS); + } bcopy((char *)dst, (char *)secassoc->dst, dst->sa_len); /* We fill this in with a plausable value now to insure that other routines don't break. These will get overwritten later with the correct values. */ +#if 0 #ifdef INET6 secassoc->from->sa_family = AF_INET6; secassoc->from->sa_len = sizeof(struct sockaddr_in6); @@ -1232,6 +1248,7 @@ key_getspi(type, vers, src, dst, lowval, highval, spi) secassoc->from->sa_family = AF_INET; secassoc->from->sa_len = sizeof(struct sockaddr_in); #endif /* INET6 */ +#endif /* * We need to add code to age these larval key table |