aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/s390/net
diff options
context:
space:
mode:
authorStefan Raspl <raspl@linux.vnet.ibm.com>2013-06-24 07:21:51 -0400
committerDavid S. Miller <davem@davemloft.net>2013-06-25 19:10:14 -0400
commitede88671664128b811e7c709bead39f5b3f3abcf (patch)
treed7084cf30706985a3b640c7806e7d89a04517073 /drivers/s390/net
parenta0c98523d7d71e0276f3cb127bc0c6d4fc85907a (diff)
qeth: Fix crash on initial MTU size change
When the initial MTU size is changed prior to any activity on the device (e.g. by attaching a z/VM vNIC already configured in Linux to a guestLAN), we call dev_kfree_skb_irq(NULL) which results in a kernel panic. Adding a proper check for NULL pointers to address this issue. Signed-off-by: Stefan Raspl <raspl@linux.vnet.ibm.com> Signed-off-by: Frank Blaschka <blaschka@linux.vnet.ibm.com> Reviewed-by: Ursula Braun <braunu@de.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/s390/net')
-rw-r--r--drivers/s390/net/qeth_core_main.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c
index d7d036bf8715..e4ca70475190 100644
--- a/drivers/s390/net/qeth_core_main.c
+++ b/drivers/s390/net/qeth_core_main.c
@@ -1282,8 +1282,10 @@ static void qeth_free_qdio_buffers(struct qeth_card *card)
1282 1282
1283 qeth_free_cq(card); 1283 qeth_free_cq(card);
1284 cancel_delayed_work_sync(&card->buffer_reclaim_work); 1284 cancel_delayed_work_sync(&card->buffer_reclaim_work);
1285 for (j = 0; j < QDIO_MAX_BUFFERS_PER_Q; ++j) 1285 for (j = 0; j < QDIO_MAX_BUFFERS_PER_Q; ++j) {
1286 dev_kfree_skb_any(card->qdio.in_q->bufs[j].rx_skb); 1286 if (card->qdio.in_q->bufs[j].rx_skb)
1287 dev_kfree_skb_any(card->qdio.in_q->bufs[j].rx_skb);
1288 }
1287 kfree(card->qdio.in_q); 1289 kfree(card->qdio.in_q);
1288 card->qdio.in_q = NULL; 1290 card->qdio.in_q = NULL;
1289 /* inbound buffer pool */ 1291 /* inbound buffer pool */