diff options
| author | Eric Dumazet <eric.dumazet@gmail.com> | 2011-11-08 13:59:44 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-11-08 13:59:44 -0500 |
| commit | e50e705ca71db82a78a3e13fb7abf6b2171ac9c7 (patch) | |
| tree | 619ba1fcb3906259b99533a0f53b0b218e52c507 /net/l2tp | |
| parent | ea1649dea95fb270af94f75e842402c4cfbfc15f (diff) | |
| download | blackbird-op-linux-e50e705ca71db82a78a3e13fb7abf6b2171ac9c7.tar.gz blackbird-op-linux-e50e705ca71db82a78a3e13fb7abf6b2171ac9c7.zip | |
l2tp: fix l2tp_udp_recv_core()
pskb_may_pull() can change skb->data, so we have to load ptr/optr at the
right place.
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/l2tp')
| -rw-r--r-- | net/l2tp/l2tp_core.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/l2tp/l2tp_core.c b/net/l2tp/l2tp_core.c index bf8d50c67931..cf0f308abf5e 100644 --- a/net/l2tp/l2tp_core.c +++ b/net/l2tp/l2tp_core.c @@ -756,9 +756,6 @@ static int l2tp_udp_recv_core(struct l2tp_tunnel *tunnel, struct sk_buff *skb, goto error; } - /* Point to L2TP header */ - optr = ptr = skb->data; - /* Trace packet contents, if enabled */ if (tunnel->debug & L2TP_MSG_DATA) { length = min(32u, skb->len); @@ -769,12 +766,15 @@ static int l2tp_udp_recv_core(struct l2tp_tunnel *tunnel, struct sk_buff *skb, offset = 0; do { - printk(" %02X", ptr[offset]); + printk(" %02X", skb->data[offset]); } while (++offset < length); printk("\n"); } + /* Point to L2TP header */ + optr = ptr = skb->data; + /* Get L2TP header flags */ hdrflags = ntohs(*(__be16 *) ptr); |
