summaryrefslogtreecommitdiffstats
path: root/drivers/s390/net/qeth_core_main.c
diff options
context:
space:
mode:
authorStefan Raspl2013-04-22 03:12:29 +0200
committerDavid S. Miller2013-04-22 21:39:27 +0200
commitd4ae1f5e5eb3a6b367acb137dec9e9599b0ce3f3 (patch)
tree66029f13e635a86d7e32ea03ad5d6f0a6f0f9de7 /drivers/s390/net/qeth_core_main.c
parentqeth: remove unused variable (diff)
downloadkernel-qcow2-linux-d4ae1f5e5eb3a6b367acb137dec9e9599b0ce3f3.tar.gz
kernel-qcow2-linux-d4ae1f5e5eb3a6b367acb137dec9e9599b0ce3f3.tar.xz
kernel-qcow2-linux-d4ae1f5e5eb3a6b367acb137dec9e9599b0ce3f3.zip
qeth: Fix missing pointer update
qeth_hdr_chk_and_bounce() can possibly shift the skb->data pointer. However, the existing code didn't update the hdr pointer, which should point to skb->data, accordingly. Symptoms of this issue are sporadic recoveries. Signed-off-by: Stefan Raspl <raspl@linux.vnet.ibm.com> Signed-off-by: Frank Blaschka <blaschka@linux.vnet.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/s390/net/qeth_core_main.c')
-rw-r--r--drivers/s390/net/qeth_core_main.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c
index 0aa9462c50ec..a86ce07736ef 100644
--- a/drivers/s390/net/qeth_core_main.c
+++ b/drivers/s390/net/qeth_core_main.c
@@ -3717,7 +3717,7 @@ int qeth_get_elements_no(struct qeth_card *card,
}
EXPORT_SYMBOL_GPL(qeth_get_elements_no);
-int qeth_hdr_chk_and_bounce(struct sk_buff *skb, int len)
+int qeth_hdr_chk_and_bounce(struct sk_buff *skb, struct qeth_hdr **hdr, int len)
{
int hroom, inpage, rest;
@@ -3730,6 +3730,8 @@ int qeth_hdr_chk_and_bounce(struct sk_buff *skb, int len)
return 1;
memmove(skb->data - rest, skb->data, skb->len - skb->data_len);
skb->data -= rest;
+ skb->tail -= rest;
+ *hdr = (struct qeth_hdr *)skb->data;
QETH_DBF_MESSAGE(2, "skb bounce len: %d rest: %d\n", len, rest);
}
return 0;