mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-28 07:13:34 +00:00
net: avoid infinite loop in mpls_gso_segment when mpls_hlen == 0
commit d348ede32e
upstream.
A packet with skb_inner_network_header(skb) == skb_network_header(skb)
and ETH_P_MPLS_UC will prevent mpls_gso_segment from pulling any headers
from the packet. Subsequently, the call to skb_mac_gso_segment will
again call mpls_gso_segment with the same packet leading to an infinite
loop. In addition, ensure that the header length is a multiple of four,
which should hold irrespective of the number of stacked labels.
Signed-off-by: Balazs Nemeth <bnemeth@redhat.com>
Acked-by: Willem de Bruijn <willemb@google.com>
Reviewed-by: David Ahern <dsahern@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
ea3fb2ce5f
commit
5ea5d57c09
1 changed files with 3 additions and 0 deletions
|
@ -18,6 +18,7 @@
|
|||
#include <linux/netdev_features.h>
|
||||
#include <linux/netdevice.h>
|
||||
#include <linux/skbuff.h>
|
||||
#include <net/mpls.h>
|
||||
|
||||
static struct sk_buff *mpls_gso_segment(struct sk_buff *skb,
|
||||
netdev_features_t features)
|
||||
|
@ -31,6 +32,8 @@ static struct sk_buff *mpls_gso_segment(struct sk_buff *skb,
|
|||
|
||||
skb_reset_network_header(skb);
|
||||
mpls_hlen = skb_inner_network_header(skb) - skb_network_header(skb);
|
||||
if (unlikely(!mpls_hlen || mpls_hlen % MPLS_HLEN))
|
||||
goto out;
|
||||
if (unlikely(!pskb_may_pull(skb, mpls_hlen)))
|
||||
goto out;
|
||||
|
||||
|
|
Loading…
Reference in a new issue