Browse Source

ipv6: Disallow rediculious flowlabel option sizes.

Just like PKTINFO, limit the options area to 64K.

Based upon report by Eric Sesterhenn and analysis by
Roland Dreier.

Signed-off-by: David S. Miller <davem@davemloft.net>
David S. Miller 16 years ago
parent
commit
684de409ac
1 changed files with 6 additions and 2 deletions
  1. 6 2
      net/ipv6/ip6_flowlabel.c

+ 6 - 2
net/ipv6/ip6_flowlabel.c

@@ -323,17 +323,21 @@ static struct ip6_flowlabel *
 fl_create(struct net *net, struct in6_flowlabel_req *freq, char __user *optval,
 fl_create(struct net *net, struct in6_flowlabel_req *freq, char __user *optval,
 	  int optlen, int *err_p)
 	  int optlen, int *err_p)
 {
 {
-	struct ip6_flowlabel *fl;
+	struct ip6_flowlabel *fl = NULL;
 	int olen;
 	int olen;
 	int addr_type;
 	int addr_type;
 	int err;
 	int err;
 
 
+	olen = optlen - CMSG_ALIGN(sizeof(*freq));
+	err = -EINVAL;
+	if (olen > 64 * 1024)
+		goto done;
+
 	err = -ENOMEM;
 	err = -ENOMEM;
 	fl = kzalloc(sizeof(*fl), GFP_KERNEL);
 	fl = kzalloc(sizeof(*fl), GFP_KERNEL);
 	if (fl == NULL)
 	if (fl == NULL)
 		goto done;
 		goto done;
 
 
-	olen = optlen - CMSG_ALIGN(sizeof(*freq));
 	if (olen > 0) {
 	if (olen > 0) {
 		struct msghdr msg;
 		struct msghdr msg;
 		struct flowi flowi;
 		struct flowi flowi;