Skip to contentSkip to conversation

ppp: fix segfaults introduced by netdev_priv changes

PATCH In review James Chapman 3 participants 6 messages Dec 17, 2008 – Dec 19, 2008

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ppp: fix segfaults introduced by netdev_priv changes

This patch fixes a segfault in ppp_shutdown_interface() and ppp_destroy_interface() when a PPP connection is closed. I bisected the problem to the following commit:

commit c8019bf3aff653cceb64f66489fc299ee5957b57
Author: Wang Chen <[email protected]>
Date: Thu Nov 20 04:24:17 2008 -0800

netdevice ppp: Convert directly reference of netdev->priv

1. Use netdev_priv(dev) to replace dev->priv.
2. Alloc netdev's private data by alloc_netdev().

The original ppp_generic code treated the netdev and struct ppp as independent data structures which were freed separately. In moving the ppp struct into the netdev, it is now possible for the private data to be freed before the call to ppp_shutdown_interface(), which is bad.

The kfree(ppp) in ppp_destroy_interface() is also wrong; presumably ppp hasn't worked since the above commit.

The following patch fixes both problems.

---

The original code set ppp->dev = NULL when the interface was closed to prevent other ppp functions from trying to access the device. But we now need the dev ptr in ppp_destroy_interface() in order to do the free_netdev(). So ppp->dev is no longer used to tell if the interface is down. Instead, a new flag (closing) is added to struct ppp. Can an existing flag be used instead to avoid creating a new variable?

 drivers/net/ppp_generic.c |   28 +++++++++++++---------------
 1 files changed, 13 insertions(+), 15 deletions(-)
drivers/net/ppp_generic.c +13 -15
index 7e857e9..714a230 100644
@@ -116,6 +116,7 @@ struct ppp {
 	unsigned long	last_xmit;	/* jiffies when last pkt sent 9c */
 	unsigned long	last_recv;	/* jiffies when last pkt rcvd a0 */
 	struct net_device *dev;		/* network interface device a4 */
+	int		closing;	/* is device closing down? a8 */
 #ifdef CONFIG_PPP_MULTILINK
 	int		nxchan;		/* next channel to send something on */
 	u32		nxseq;		/* next sequence number to send */
@@ -995,7 +996,7 @@ ppp_xmit_process(struct ppp *ppp)
 	struct sk_buff *skb;
 
 	ppp_xmit_lock(ppp);
-	if (ppp->dev) {
+	if (!ppp->closing) {
 		ppp_push(ppp);
 		while (!ppp->xmit_pending
 		       && (skb = skb_dequeue(&ppp->file.xq)))
@@ -1463,8 +1464,7 @@ static inline void
 ppp_do_recv(struct ppp *ppp, struct sk_buff *skb, struct channel *pch)
 {
 	ppp_recv_lock(ppp);
-	/* ppp->dev == 0 means interface is closing down */
-	if (ppp->dev)
+	if (!ppp->closing)
 		ppp_receive_frame(ppp, skb, pch);
 	else
 		kfree_skb(skb);
@@ -2498,18 +2498,16 @@ init_ppp_file(struct ppp_file *pf, int kind)
  */
 static void ppp_shutdown_interface(struct ppp *ppp)
 {
-	struct net_device *dev;
-
 	mutex_lock(&all_ppp_mutex);
-	ppp_lock(ppp);
-	dev = ppp->dev;
-	ppp->dev = NULL;
-	ppp_unlock(ppp);
 	/* This will call dev_close() for us. */
-	if (dev) {
-		unregister_netdev(dev);
-		free_netdev(dev);
-	}
+	ppp_lock(ppp);
+	if (!ppp->closing) {
+		ppp->closing = 1;
+		ppp_unlock(ppp);
+		unregister_netdev(ppp->dev);
+	} else
+		ppp_unlock(ppp);
+
 	cardmap_set(&all_ppp_units, ppp->file.index, NULL);
 	ppp->file.dead = 1;
 	ppp->owner = NULL;
@@ -2554,7 +2552,7 @@ static void ppp_destroy_interface(struct ppp *ppp)
 	if (ppp->xmit_pending)
 		kfree_skb(ppp->xmit_pending);
 
-	kfree(ppp);
+	free_netdev(ppp->dev);
 }
 
 /*
@@ -2616,7 +2614,7 @@ ppp_connect_channel(struct channel *pch, int unit)
 	if (pch->file.hdrlen > ppp->file.hdrlen)
 		ppp->file.hdrlen = pch->file.hdrlen;
 	hdrlen = pch->file.hdrlen + 2;	/* for protocol bytes */
-	if (ppp->dev && hdrlen > ppp->dev->hard_header_len)
+	if (hdrlen > ppp->dev->hard_header_len)
 		ppp->dev->hard_header_len = hdrlen;
 	list_add_tail(&pch->clist, &ppp->channels);
 	++ppp->n_channels;
#1 lore raw

James Chapman said the following on 2008-12-18 6:02:

Quoted 8 lines

This patch fixes a segfault in ppp_shutdown_interface() and ppp_destroy_interface() when a PPP connection is closed. I bisected the problem to the following commit:

commit c8019bf3aff653cceb64f66489fc299ee5957b57
Author: Wang Chen <[email protected]>
Date: Thu Nov 20 04:24:17 2008 -0800

Quoted 8 lines

netdevice ppp: Convert directly reference of netdev->priv

1. Use netdev_priv(dev) to replace dev->priv.
2. Alloc netdev's private data by alloc_netdev().

Yes. My bad.
I should cc my previous patch to you ;)

Quoted 26 lines

static void ppp_shutdown_interface(struct ppp *ppp) {

drivers/net/ppp_generic.c +8 -10
-	struct net_device *dev;
-
 	mutex_lock(&all_ppp_mutex);
-	ppp_lock(ppp);
-	dev = ppp->dev;
-	ppp->dev = NULL;
-	ppp_unlock(ppp);
 	/* This will call dev_close() for us. */
-	if (dev) {
-		unregister_netdev(dev);
-		free_netdev(dev);
-	}
+	ppp_lock(ppp);
+	if (!ppp->closing) {
+		ppp->closing = 1;
+		ppp_unlock(ppp);
+		unregister_netdev(ppp->dev);
+	} else
+		ppp_unlock(ppp);
+
 	cardmap_set(&all_ppp_units, ppp->file.index, NULL);
 	ppp->file.dead = 1;
 	ppp->owner = NULL;

drivers/net/ppp_generic.c static void ppp_destroy_interface(struct ppp *ppp) · line 2557

Quoted 7 lines
drivers/net/ppp_generic.c +1 -1
@@ -2554,7 +2552,7 @@ static void ppp_destroy_interface(struct ppp *ppp)
 	if (ppp->xmit_pending)
 		kfree_skb(ppp->xmit_pending);
 
-	kfree(ppp);
+	free_netdev(ppp->dev);
 }
 

I have no comment on these changes, but
there is a path that calls only ppp_destroy_interface() no ppp_shutdown_interface().
it's:
ppp_unregister_channel

    --->ppp_disconnect_channel()
        ---> ppp_destroy_interface()

drivers/net/ppp_generic.c ppp_connect_channel(struct channel *pch, int unit) · line 2620

Quoted 10 lines
drivers/net/ppp_generic.c +1 -1
 /*
@@ -2616,7 +2614,7 @@ ppp_connect_channel(struct channel *pch, int unit)
 	if (pch->file.hdrlen > ppp->file.hdrlen)
 		ppp->file.hdrlen = pch->file.hdrlen;
 	hdrlen = pch->file.hdrlen + 2;	/* for protocol bytes */
-	if (ppp->dev && hdrlen > ppp->dev->hard_header_len)
+	if (hdrlen > ppp->dev->hard_header_len)
 		ppp->dev->hard_header_len = hdrlen;
 	list_add_tail(&pch->clist, &ppp->channels);
 	++ppp->n_channels;

I don't understand this change.
Do you mean that in this place, ppp->dev will never be NULL?

B.R
Wang Chen

#2 lore raw
Quoted 7 lines · Wang Chen

I have no comment on these changes, but
there is a path that calls only ppp_destroy_interface() no ppp_shutdown_interface().
it's:
ppp_unregister_channel

    --->ppp_disconnect_channel()
        ---> ppp_destroy_interface()

Isn't ppp_shutdown_interface() always called first? If not, then we need to unregister_netdev() before the free_netdev() call in ppp_destroy_interface(). The original code didn't cover that case.

Quoted 5 lines
Quoted 5 lines

/*

drivers/net/ppp_generic.c +0 -0
@@ -2616,7 +2614,7 @@ ppp_connect_channel(struct channel *pch, int unit)
 	if (pch->file.hdrlen > ppp->file.hdrlen)
 		ppp->file.hdrlen = pch->file.hdrlen;
 	hdrlen = pch->file.hdrlen + 2;	/* for protocol bytes */
Quoted 8 lines

drivers/net/ppp_generic.c ppp_connect_channel(struct channel *pch, int unit) · line 2620

Quoted 5 lines
drivers/net/ppp_generic.c +1 -1
-	if (ppp->dev && hdrlen > ppp->dev->hard_header_len)
+	if (hdrlen > ppp->dev->hard_header_len)
 		ppp->dev->hard_header_len = hdrlen;
 	list_add_tail(&pch->clist, &ppp->channels);
 	++ppp->n_channels;

I don't understand this change.
Do you mean that in this place, ppp->dev will never be NULL?

After my change, yes. See the comment in the patch preamble.

Signature · 4 lines
James Chapman
Katalix Systems Ltd
http://www.katalix.com
Catalysts for your Embedded Linux software development
maintainer
#3 lore raw
In reply to James Chapman

From: James Chapman <[email protected]>
Date: Wed, 17 Dec 2008 22:02:16 GMT

drivers/net/ppp_generic.c init_ppp_file(struct ppp_file *pf, int kind) · line 2513

Quoted 6 lines
drivers/net/ppp_generic.c +3 -0
+	} else
+		ppp_unlock(ppp);
+
 	cardmap_set(&all_ppp_units, ppp->file.index, NULL);
 	ppp->file.dead = 1;
 	ppp->owner = NULL;

James, thanks for this fix. But you'll need to respin this as it conflicts with the IDR changes that are in net-next-2.6 (this cardmap_set call isn't there any more, for example).

Thanks.

#4 lore raw
Quoted 13 lines · David Miller

From: James Chapman <[email protected]>
Date: Wed, 17 Dec 2008 22:02:16 GMT

drivers/net/ppp_generic.c init_ppp_file(struct ppp_file *pf, int kind) · line 2513

Quoted 6 lines
drivers/net/ppp_generic.c +3 -0
+	} else
+		ppp_unlock(ppp);
+
 	cardmap_set(&all_ppp_units, ppp->file.index, NULL);
 	ppp->file.dead = 1;
 	ppp->owner = NULL;

James, thanks for this fix. But you'll need to respin this as it conflicts with the IDR changes that are in net-next-2.6 (this cardmap_set call isn't there any more, for example).

The patch is against net-2.6. I assumed it was appropriate for net-2.6 since we're on rc8 and ppp has been broken since rc6. :) Sorry I didn't mention that in the patch.

I'll spin a version for net-next-2.6 later today.

Signature · 4 lines
James Chapman
Katalix Systems Ltd
http://www.katalix.com
Catalysts for your Embedded Linux software development
maintainer
#5 lore raw

From: James Chapman <[email protected]>
Date: Thu, 18 Dec 2008 10:28:19 +0000

Quoted 15 lines
Quoted 13 lines · David Miller

From: James Chapman <[email protected]>
Date: Wed, 17 Dec 2008 22:02:16 GMT

drivers/net/ppp_generic.c init_ppp_file(struct ppp_file *pf, int kind) · line 2513

Quoted 6 lines
drivers/net/ppp_generic.c +3 -0
+	} else
+		ppp_unlock(ppp);
+
 	cardmap_set(&all_ppp_units, ppp->file.index, NULL);
 	ppp->file.dead = 1;
 	ppp->owner = NULL;

James, thanks for this fix. But you'll need to respin this as it conflicts with the IDR changes that are in net-next-2.6 (this cardmap_set call isn't there any more, for example).

Quoted 3 lines

The patch is against net-2.6. I assumed it was appropriate for net-2.6 since we're on rc8 and ppp has been broken since rc6. :) Sorry I didn't mention that in the patch.

That part I missed, I thought it was caused by the conversions we did only in net-next-2.6

I'll apply your original net-2.6 patch, thanks James!