[<prev] [next>] [day] [month] [year] [list]
Message-ID: <20070313145255.GP17712@florz.florz.dyndns.org>
Date: Tue, 13 Mar 2007 15:52:55 +0100
From: Florian Zumbiehl <florz@...rz.de>
To: mostrows@...thlink.net, netdev@...r.kernel.org
Subject: [PATCH 3/3] PPPoE: move lock_sock() in pppoe_sendmsg() to the right location
Hi,
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.
Florian
---------------------------------------------------------------------------
Signed-off-by: Florian Zumbiehl <florz@...rz.de>
diff --git a/drivers/net/pppoe.c b/drivers/net/pppoe.c
index 9554924..eef8a5b 100644
--- a/drivers/net/pppoe.c
+++ b/drivers/net/pppoe.c
@@ -779,6 +779,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;
@@ -789,8 +790,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;
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists