summaryrefslogtreecommitdiffstats
path: root/sys/netinet6/icmp6.c
diff options
context:
space:
mode:
authorsimon <simon@FreeBSD.org>2008-09-03 19:09:47 +0000
committersimon <simon@FreeBSD.org>2008-09-03 19:09:47 +0000
commit6bb93e188cd52e460f98be21d1c7a98536eb1276 (patch)
treebdf13f39a4170d136aa0d2ee104a49cf4da88171 /sys/netinet6/icmp6.c
parent0791911684a7ddb284dc09213bf5df5714f194fa (diff)
downloadFreeBSD-src-6bb93e188cd52e460f98be21d1c7a98536eb1276.zip
FreeBSD-src-6bb93e188cd52e460f98be21d1c7a98536eb1276.tar.gz
- Fix amd64 local privilege escalation. [08:07]
- Fix nmount(2) local privilege escalation. [08:08] - Fix IPv6 remote kernel panics. [08:09] Fix for [08:07] is merge of r181823. Submitted by: kib [08:07], csjp [08:08], bz [08:09] Reviewed by: peter [08:07], jhb [08:07] Reviewed by: jinmei [08:09], rwatson [08:09] Approved by: re (SA blanket) Approved by: so (simon) Security: FreeBSD-SA-08:07.amd64 Security: FreeBSD-SA-08:08.nmount Security: FreeBSD-SA-08:09.icmp6
Diffstat (limited to 'sys/netinet6/icmp6.c')
-rw-r--r--sys/netinet6/icmp6.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c
index 3391d57..c4651ef 100644
--- a/sys/netinet6/icmp6.c
+++ b/sys/netinet6/icmp6.c
@@ -1122,6 +1122,15 @@ icmp6_mtudisc_update(struct ip6ctlparam *ip6cp, int validated)
if (!validated)
return;
+ /*
+ * In case the suggested mtu is less than IPV6_MMTU, we
+ * only need to remember that it was for above mentioned
+ * "alwaysfrag" case.
+ * Try to be as close to the spec as possible.
+ */
+ if (mtu < IPV6_MMTU)
+ mtu = IPV6_MMTU - 8;
+
bzero(&inc, sizeof(inc));
inc.inc_flags = 1; /* IPv6 */
inc.inc6_faddr = *dst;
OpenPOWER on IntegriCloud