]> git.baikalelectronics.ru Git - kernel.git/commit
l2tp: fix reading optional fields of L2TPv3
authorJacob Wen <jian.w.wen@oracle.com>
Wed, 30 Jan 2019 06:55:14 +0000 (14:55 +0800)
committerDavid S. Miller <davem@davemloft.net>
Thu, 31 Jan 2019 05:44:17 +0000 (21:44 -0800)
commit7ad9ead2b558ccfd7d254f59501c47d3d7109709
tree728bac936414d722904e8a7ca6cca9db86629bb7
parent22e1f7ea00091e4e0b0cfcaae10a532db285ec98
l2tp: fix reading optional fields of L2TPv3

Use pskb_may_pull() to make sure the optional fields are in skb linear
parts, so we can safely read them later.

It's easy to reproduce the issue with a net driver that supports paged
skb data. Just create a L2TPv3 over IP tunnel and then generates some
network traffic.
Once reproduced, rx err in /sys/kernel/debug/l2tp/tunnels will increase.

Changes in v4:
1. s/l2tp_v3_pull_opt/l2tp_v3_ensure_opt_in_linear/
2. s/tunnel->version != L2TP_HDR_VER_2/tunnel->version == L2TP_HDR_VER_3/
3. Add 'Fixes' in commit messages.

Changes in v3:
1. To keep consistency, move the code out of l2tp_recv_common.
2. Use "net" instead of "net-next", since this is a bug fix.

Changes in v2:
1. Only fix L2TPv3 to make code simple.
   To fix both L2TPv3 and L2TPv2, we'd better refactor l2tp_recv_common.
   It's complicated to do so.
2. Reloading pointers after pskb_may_pull

Fixes: 9b4d7c520ad6 ("l2tp: Add L2TPv3 protocol support")
Fixes: fb6422603825 ("l2tp: Add L2TPv3 IP encapsulation (no UDP) support")
Fixes: d1aaf87067e6 ("l2tp: introduce L2TPv3 IP encapsulation support for IPv6")
Signed-off-by: Jacob Wen <jian.w.wen@oracle.com>
Acked-by: Guillaume Nault <gnault@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/l2tp/l2tp_core.c
net/l2tp/l2tp_core.h
net/l2tp/l2tp_ip.c
net/l2tp/l2tp_ip6.c