---

yaml --- r: 341698 b: refs/heads/master c: 3b1a914 h: refs/heads/master v: v3
git-mirror · Nov 28, 2012 · c06782c · c06782c
1 parent 4b23d73
commit c06782c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ec809bd817dfa1905283468e4c813684ed4efe78
+refs/heads/master: 3b1a914595f3f9beb9e38ff3ddc7bdafa092ba22
diff --git a/trunk/net/atm/pppoatm.c b/trunk/net/atm/pppoatm.c
@@ -406,6 +406,8 @@ static int pppoatm_ioctl(struct socket *sock, unsigned int cmd,
 			return -ENOIOCTLCMD;
 		if (!capable(CAP_NET_ADMIN))
 			return -EPERM;
+		if (sock->state != SS_CONNECTED)
+			return -EINVAL;
 		return pppoatm_assign_vcc(atmvcc, argp);
 		}
 	case PPPIOCGCHAN: