commit 86c1dcfc96a778433ebc6e9b1d3e80a126cb80f2
author Florian Zumbiehl <florz@florz.de> Mon Jul 30 17:48:23 2007 -0700
committer David S. Miller <davem@sunset.davemloft.net> Tue Jul 31 02:28:22 2007 -0700
tree ad6f69355b76974d2a80ab56313225aa557eb459
parent c61a7d10efbd187ab9bb54871238ebd1dfcacd44

[PPPoX/E]: return ENOTTY on unknown ioctl requests

here another patch for the PPPoX/E code that makes sure that ENOTTY is
returned for unknown ioctl requests rather than 0 (and removes another
unneeded initializer which I didn't bother creating a separate patch for).

Signed-off-by: Florian Zumbiehl <florz@florz.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

drivers/net/pppoe.c

diff --git a/drivers/net/pppoe.c b/drivers/net/pppoe.c
index 6f98834..f75aeaa 100644
--- a/drivers/net/pppoe.c
+++ b/drivers/net/pppoe.c
@@ -664,8 +664,8 @@
 {
 	struct sock *sk = sock->sk;
 	struct pppox_sock *po = pppox_sk(sk);
-	int val = 0;
-	int err = 0;
+	int val;
+	int err;
 
 	switch (cmd) {
 	case PPPIOCGMRU:
@@ -754,8 +754,9 @@
 		err = 0;
 		break;
 
-	default:;
-	};
+	default:
+		err = -ENOTTY;
+	}
 
 	return err;
 }

drivers/net/pppox.c

diff --git a/drivers/net/pppox.c b/drivers/net/pppox.c
index f3e47d0..25c52b5 100644
--- a/drivers/net/pppox.c
+++ b/drivers/net/pppox.c
@@ -73,7 +73,7 @@
 {
 	struct sock *sk = sock->sk;
 	struct pppox_sock *po = pppox_sk(sk);
-	int rc = 0;
+	int rc;
 
 	lock_sock(sk);
 
@@ -94,12 +94,9 @@
 		break;
 	}
 	default:
-		if (pppox_protos[sk->sk_protocol]->ioctl)
-			rc = pppox_protos[sk->sk_protocol]->ioctl(sock, cmd,
-								  arg);
-
-		break;
-	};
+		rc = pppox_protos[sk->sk_protocol]->ioctl ?
+			pppox_protos[sk->sk_protocol]->ioctl(sock, cmd, arg) : -ENOTTY;
+	}
 
 	release_sock(sk);
 	return rc;