renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-16 01:04:08 +08:00
Code

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

Browse Source 
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>
This commit is contained in:
Florian Zumbiehl 2007-07-30 17:48:23 -07:00 committed by David S. Miller
parent c61a7d10ef
commit 86c1dcfc96
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/net/pppoe.c
View File

@ -664,8 +664,8 @@ static int pppoe_ioctl(struct socket *sock, unsigned int cmd,
{
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 @@ static int pppoe_ioctl(struct socket *sock, unsigned int cmd,
err = 0;
break;
default:;
};
default:
err = -ENOTTY;
}
return err;
}

11
drivers/net/pppox.c
View File

@ -73,7 +73,7 @@ int pppox_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
{
struct sock *sk = sock->sk;
struct pppox_sock *po = pppox_sk(sk);
int rc = 0;
int rc;
lock_sock(sk);
@ -94,12 +94,9 @@ int pppox_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
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;