---

yaml --- r: 341709 b: refs/heads/master c: 9eba252 h: refs/heads/master i: 341707: d172933 v: v3
git-mirror · Dec 2, 2012 · e5024e4 · e5024e4
1 parent 4374424
commit e5024e4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 007ef52be171b9eee6f4099d3e5706e8068d31ef
+refs/heads/master: 9eba25268e5862571d53122065616c456fe1142a
diff --git a/trunk/net/atm/br2684.c b/trunk/net/atm/br2684.c
@@ -735,10 +735,13 @@ static int br2684_ioctl(struct socket *sock, unsigned int cmd,
 			return -ENOIOCTLCMD;
 		if (!capable(CAP_NET_ADMIN))
 			return -EPERM;
-		if (cmd == ATM_SETBACKEND)
+		if (cmd == ATM_SETBACKEND) {
+			if (sock->state != SS_CONNECTED)
+				return -EINVAL;
 			return br2684_regvcc(atmvcc, argp);
-		else
+		} else {
 			return br2684_create(argp);
+		}
 #ifdef CONFIG_ATM_BR2684_IPFILTER
 	case BR2684_SETFILT:
 		if (atmvcc->push != br2684_push)