Thread (5 messages) 5 messages, 2 authors, 2015-12-03

Re: Kernel 4.1.12 crash

From: Andrew <hidden>
Date: 2015-12-03 21:10:05

Possibly related (same subject, not in this thread)

Hi.

Thanks, I'll rebuild kernel with your patch "pppoe: fix memory 
corruption in padt work structure", tryto check it in test env, and try 
to update PPPoE servers.

03.12.2015 17:35, Guillaume Nault wrote:
On Wed, Dec 02, 2015 at 06:23:35PM +0100, Guillaume Nault wrote:
quoted
You can try the following. It's not yet a proper fix as there are still
a few things that bug me in pppoe_connect().

---
diff --git a/drivers/net/ppp/pppoe.c b/drivers/net/ppp/pppoe.c
index 5e0b432..865b74d 100644
--- a/drivers/net/ppp/pppoe.c
+++ b/drivers/net/ppp/pppoe.c
@@ -568,6 +568,9 @@ static int pppoe_create(struct net *net, struct socket *sock, int kern)
  	sk->sk_family		= PF_PPPOX;
  	sk->sk_protocol		= PX_PROTO_OE;
  
+	INIT_WORK(&pppox_sk(sk)->proto.pppoe.padt_work,
+		  pppoe_unbind_sock_work);
+
  	return 0;
  }
  
@@ -632,8 +635,6 @@ static int pppoe_connect(struct socket *sock, struct sockaddr *uservaddr,
  
  	lock_sock(sk);
  
-	INIT_WORK(&po->proto.pppoe.padt_work, pppoe_unbind_sock_work);
-
  	error = -EINVAL;
  	if (sp->sa_protocol != PX_PROTO_OE)
  		goto end;
@@ -663,8 +664,6 @@ static int pppoe_connect(struct socket *sock, struct sockaddr *uservaddr,
  			po->pppoe_dev = NULL;
  		}
  
-		memset(sk_pppox(po) + 1, 0,
-		       sizeof(struct pppox_sock) - sizeof(struct sock));
  		sk->sk_state = PPPOX_NONE;
  	}
  
Finally, I'm going to send something similar to -net and keep the rest
of pppoe_connect() modifications for net-next. This will ease
backporting to -stable.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help