This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / net / ipv6 / route.c

diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 442b4d5..0386384 100644 (file)
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -554,6 +554,8 @@ static void ip6_rt_update_pmtu(struct dst_entry *dst, u32 mtu)
 
        if (mtu < dst_pmtu(dst) && rt6->rt6i_dst.plen == 128) {
                rt6->rt6i_flags |= RTF_MODIFIED;
+               if (mtu < IPV6_MIN_MTU)
+                       mtu = IPV6_MIN_MTU;
                dst->metrics[RTAX_MTU-1] = mtu;
        }
 }
@@ -1217,7 +1219,7 @@ restart:
        read_unlock_bh(&rt6_lock);
 }
 
-int ipv6_route_ioctl(unsigned int cmd, void *arg)
+int ipv6_route_ioctl(unsigned int cmd, void __user *arg)
 {
        struct in6_rtmsg rtmsg;
        int err;
@@ -1884,7 +1886,7 @@ static int flush_delay;
 
 static
 int ipv6_sysctl_rtcache_flush(ctl_table *ctl, int write, struct file * filp,
-                             void *buffer, size_t *lenp)
+                             void __user *buffer, size_t *lenp)
 {
        if (write) {
                proc_dointvec(ctl, write, filp, buffer, lenp);