diff options
| author | William Tu <u9012063@gmail.com> | 2017-12-15 14:27:43 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-12-18 15:11:25 -0500 |
| commit | ae3e13373b879670d873e5657a903bd208f0dc40 (patch) | |
| tree | 90eaf8a48762d72aef82758d5961159a042e14af /net/ipv4/ip_gre.c | |
| parent | 814a17841325643e2d08984d076f976a0b423872 (diff) | |
| download | op-kernel-dev-ae3e13373b879670d873e5657a903bd208f0dc40.zip op-kernel-dev-ae3e13373b879670d873e5657a903bd208f0dc40.tar.gz | |
net: erspan: fix wrong return value
If pskb_may_pull return failed, return PACKET_REJECT
instead of -ENOMEM.
Fixes: 94d7d8f29287 ("ip6_gre: add erspan v2 support")
Fixes: f551c91de262 ("net: erspan: introduce erspan v2 for ip_gre")
Signed-off-by: William Tu <u9012063@gmail.com>
Cc: Haishuang Yan <yanhaishuang@cmss.chinamobile.com>
Acked-by: Haishuang Yan <yanhaishuang@cmss.chinamobile.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ip_gre.c')
| -rw-r--r-- | net/ipv4/ip_gre.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c index 9a80d84..b3a32a9 100644 --- a/net/ipv4/ip_gre.c +++ b/net/ipv4/ip_gre.c @@ -287,7 +287,7 @@ static int erspan_rcv(struct sk_buff *skb, struct tnl_ptk_info *tpi, if (tunnel) { len = gre_hdr_len + erspan_hdr_len(ver); if (unlikely(!pskb_may_pull(skb, len))) - return -ENOMEM; + return PACKET_REJECT; if (__iptunnel_pull_header(skb, len, |
