From db344fc90b6314a66949d179968d7115897d1436 Mon Sep 17 00:00:00 2001
From: James Morris <jmorris@namei.org>
Date: Mon, 30 Oct 2006 18:56:06 -0800
Subject: [PATCH] --- yaml --- r: 40542 b: refs/heads/master c:
 c6817e4c32d8c4118405d2dec30ac1c264349085 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/net/ipv6/ip6_flowlabel.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c63d606009f7..9727a6039094 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: de76e695a5ce19c121ba7e246b45f258be678a75
+refs/heads/master: c6817e4c32d8c4118405d2dec30ac1c264349085
diff --git a/trunk/net/ipv6/ip6_flowlabel.c b/trunk/net/ipv6/ip6_flowlabel.c
index 062e526a668c..2b45f2d657c2 100644
--- a/trunk/net/ipv6/ip6_flowlabel.c
+++ b/trunk/net/ipv6/ip6_flowlabel.c
@@ -330,8 +330,10 @@ fl_create(struct in6_flowlabel_req *freq, char __user *optval, int optlen, int *
 	fl->share = freq->flr_share;
 	addr_type = ipv6_addr_type(&freq->flr_dst);
 	if ((addr_type&IPV6_ADDR_MAPPED)
-	    || addr_type == IPV6_ADDR_ANY)
+	    || addr_type == IPV6_ADDR_ANY) {
+		err = -EINVAL;
 		goto done;
+	}
 	ipv6_addr_copy(&fl->dst, &freq->flr_dst);
 	atomic_set(&fl->users, 1);
 	switch (fl->share) {