[src/netbsd-6-1]: src/doc Tickets #1546 and #1547

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/99f62bd33349
branches:  netbsd-6-1
changeset: 318695:99f62bd33349
user:      martin <martin%NetBSD.org@localhost>
date:      Thu May 03 15:01:58 2018 +0000
description:
Tickets #1546 and #1547

diffstat:

 doc/CHANGES-6.1.6 |  15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

diffs (26 lines):

diff -r f386f1eb9f02 -r 99f62bd33349 doc/CHANGES-6.1.6
--- a/doc/CHANGES-6.1.6 Thu May 03 15:01:20 2018 +0000
+++ b/doc/CHANGES-6.1.6 Thu May 03 15:01:58 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-6.1.6,v 1.1.2.139 2018/04/18 07:19:52 msaitoh Exp $
+# $NetBSD: CHANGES-6.1.6,v 1.1.2.140 2018/05/03 15:01:58 martin Exp $
 
 A complete list of changes from the NetBSD 6.1.5 release to the NetBSD 6.1.6
 release:
@@ -15128,3 +15128,16 @@
        Don't assume M_PKTHDR is set only on the first mbuf of the chain.
        Fix a pretty bad mistake (IPsec DoS).
        [maxv, ticket #1545]
+
+sys/netipsec/ipsec_output.c                    1.67,1.75 (patch)
+
+       compute_ipsec_pos: strengthen checks to avoid overruns,
+       allow the function to fail (and drop the misformed packet).
+       [maxv, ticket #1546]
+
+sys/kern/uipc_mbuf.c                           1.211
+
+       Modify m_defrag, so that it never frees the first mbuf of
+       the chain.
+       [maxv, ticket #1547]
+