| Message ID | 1513305976-20707-1-git-send-email-yanhaishuang@cmss.chinamobile.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | ip_gre: fix wrong return value of erspan_rcv | expand |
On Thu, Dec 14, 2017 at 6:46 PM, Haishuang Yan <yanhaishuang@cmss.chinamobile.com> wrote: > If pskb_may_pull return failed, return PACKET_REJECT instead of -ENOMEM. > > Fixes: 84e54fe0a5ea ("gre: introduce native tunnel support for ERSPAN") > Cc: William Tu <u9012063@gmail.com> > Signed-off-by: Haishuang Yan <yanhaishuang@cmss.chinamobile.com> > --- Thanks for the patch. I think the other way is simply to just 'goto drop', freeing the skb in erspan_rcv(), instead of 'return PACKET_REJECT'. I'm ok either way. Acked-by: William Tu <u9012063@gmail.com>
From: Haishuang Yan <yanhaishuang@cmss.chinamobile.com> Date: Fri, 15 Dec 2017 10:46:16 +0800 > If pskb_may_pull return failed, return PACKET_REJECT instead of -ENOMEM. > > Fixes: 84e54fe0a5ea ("gre: introduce native tunnel support for ERSPAN") > Cc: William Tu <u9012063@gmail.com> > Signed-off-by: Haishuang Yan <yanhaishuang@cmss.chinamobile.com> Applied.
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c index 61ee014..d747d06 100644 --- a/net/ipv4/ip_gre.c +++ b/net/ipv4/ip_gre.c @@ -267,7 +267,7 @@ static int erspan_rcv(struct sk_buff *skb, struct tnl_ptk_info *tpi, len = gre_hdr_len + sizeof(*ershdr); if (unlikely(!pskb_may_pull(skb, len))) - return -ENOMEM; + return PACKET_REJECT; iph = ip_hdr(skb); ershdr = (struct erspanhdr *)(skb->data + gre_hdr_len);
If pskb_may_pull return failed, return PACKET_REJECT instead of -ENOMEM. Fixes: 84e54fe0a5ea ("gre: introduce native tunnel support for ERSPAN") Cc: William Tu <u9012063@gmail.com> Signed-off-by: Haishuang Yan <yanhaishuang@cmss.chinamobile.com> --- net/ipv4/ip_gre.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)