diff options
| author | Florian Zumbiehl | 2007-07-31 02:49:13 +0200 |
|---|---|---|
| committer | David S. Miller | 2007-07-31 11:28:23 +0200 |
| commit | 8aeca8fea5f2de2563e097829d62af30ca2de650 (patch) | |
| tree | d7fe27b3cef67e8f44836082ea21c42e88ab5d58 | |
| parent | [PPPoX/E]: return ENOTTY on unknown ioctl requests (diff) | |
| download | kernel-qcow2-linux-8aeca8fea5f2de2563e097829d62af30ca2de650.tar.gz kernel-qcow2-linux-8aeca8fea5f2de2563e097829d62af30ca2de650.tar.xz kernel-qcow2-linux-8aeca8fea5f2de2563e097829d62af30ca2de650.zip | |
[PPPoE]: move lock_sock() in pppoe_sendmsg() to the right location
and the last one for now: Acquire the sock lock in pppoe_sendmsg()
before accessing the sock - and in particular avoid releasing the lock
even though it hasn't been acquired.
Signed-off-by: Florian Zumbiehl <florz@florz.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/pppoe.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/pppoe.c b/drivers/net/pppoe.c index f75aeaaf861f..35a7385ccb2a 100644 --- a/drivers/net/pppoe.c +++ b/drivers/net/pppoe.c @@ -774,6 +774,7 @@ static int pppoe_sendmsg(struct kiocb *iocb, struct socket *sock, struct net_device *dev; char *start; + lock_sock(sk); if (sock_flag(sk, SOCK_DEAD) || !(sk->sk_state & PPPOX_CONNECTED)) { error = -ENOTCONN; goto end; @@ -784,8 +785,6 @@ static int pppoe_sendmsg(struct kiocb *iocb, struct socket *sock, hdr.code = 0; hdr.sid = po->num; - lock_sock(sk); - dev = po->pppoe_dev; error = -EMSGSIZE; |