diff --git a/[refs] b/[refs]
index b95b9903cd09..5e82c8f7a994 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 36e3deae8ba84865fd9eb3f2f21bbc00d49b7544
+refs/heads/master: e8766fc86b34d44a8c55a2f9d71da69e091b1ca4
diff --git a/trunk/net/ipv6/datagram.c b/trunk/net/ipv6/datagram.c
index b9c2de84a8a2..0f0f94a40335 100644
--- a/trunk/net/ipv6/datagram.c
+++ b/trunk/net/ipv6/datagram.c
@@ -705,6 +705,11 @@ int datagram_send_ctl(struct net *net,
 			}
 
 			*hlimit = *(int *)CMSG_DATA(cmsg);
+			if (*hlimit < -1 || *hlimit > 0xff) {
+				err = -EINVAL;
+				goto exit_f;
+			}
+
 			break;
 
 		case IPV6_TCLASS: