Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-7-0]: src/sys/netinet6 Pull up following revision(s) (requested b...
details: https://anonhg.NetBSD.org/src/rev/1d6068f2e636
branches: netbsd-7-0
changeset: 801470:1d6068f2e636
user: martin <martin%NetBSD.org@localhost>
date: Sun Apr 01 09:09:58 2018 +0000
description:
Pull up following revision(s) (requested by maxv in ticket #1590):
sys/netinet6/ip6_forward.c: revision 1.91 (via patch)
Fix two pretty bad mistakes. If ipsec6_check_policy fails m is not freed,
and a 'goto out' is missing after ipsec6_process_packet.
diffstat:
sys/netinet6/ip6_forward.c | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diffs (37 lines):
diff -r fa1b18242bdb -r 1d6068f2e636 sys/netinet6/ip6_forward.c
--- a/sys/netinet6/ip6_forward.c Sun Mar 25 14:12:19 2018 +0000
+++ b/sys/netinet6/ip6_forward.c Sun Apr 01 09:09:58 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ip6_forward.c,v 1.73.2.1.2.1 2018/02/12 18:37:48 snj Exp $ */
+/* $NetBSD: ip6_forward.c,v 1.73.2.1.2.2 2018/04/01 09:09:58 martin Exp $ */
/* $KAME: ip6_forward.c,v 1.109 2002/09/11 08:10:17 sakane Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip6_forward.c,v 1.73.2.1.2.1 2018/02/12 18:37:48 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_forward.c,v 1.73.2.1.2.2 2018/04/01 09:09:58 martin Exp $");
#include "opt_gateway.h"
#include "opt_ipsec.h"
@@ -166,6 +166,7 @@
*/
if (error == -EINVAL)
error = 0;
+ m_freem(m);
goto freecopy;
}
}
@@ -264,8 +265,10 @@
int s = splsoftnet();
error = ipsec6_process_packet(m, sp->req);
splx(s);
+ /* m is freed */
if (mcopy)
goto freecopy;
+ return;
}
#endif
Home |
Main Index |
Thread Index |
Old Index