diff mbox

ipv4: fix a potential use after free in gre_offload.c

Message ID 1413624364-12944-1-git-send-email-roy.qing.li@gmail.com
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

Li RongQing Oct. 18, 2014, 9:26 a.m. UTC 
From: Li RongQing <roy.qing.li@gmail.com>

pskb_may_pull() may change skb->data and make greh pointer oboslete;
so need to reassign greh;
but since first calling pskb_may_pull already ensured that skb->data
has enough space for greh, so move the reference of greh before second
calling pskb_may_pull(), to avoid reassign greh.

Fixes: 7a7ffbabf9("ipv4: fix tunneled VM traffic over hw VXLAN/GRE GSO NIC")
Cc: Wei-Chun Chao <weichunc@plumgrid.com>
Signed-off-by: Li RongQing <roy.qing.li@gmail.com>
---
 net/ipv4/gre_offload.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Eric Dumazet Oct. 18, 2014, 3:47 p.m. UTC | #1 
On Sat, 2014-10-18 at 17:26 +0800, roy.qing.li@gmail.com wrote:
> From: Li RongQing <roy.qing.li@gmail.com>
> 
> pskb_may_pull() may change skb->data and make greh pointer oboslete;
> so need to reassign greh;
> but since first calling pskb_may_pull already ensured that skb->data
> has enough space for greh, so move the reference of greh before second
> calling pskb_may_pull(), to avoid reassign greh.
> 
> Fixes: 7a7ffbabf9("ipv4: fix tunneled VM traffic over hw VXLAN/GRE GSO NIC")
> Cc: Wei-Chun Chao <weichunc@plumgrid.com>
> Signed-off-by: Li RongQing <roy.qing.li@gmail.com>
> ---

Acked-by: Eric Dumazet <edumazet@google.com>


--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Miller Oct. 18, 2014, 5:07 p.m. UTC | #2 
From: roy.qing.li@gmail.com
Date: Sat, 18 Oct 2014 17:26:04 +0800

> From: Li RongQing <roy.qing.li@gmail.com>
> 
> pskb_may_pull() may change skb->data and make greh pointer oboslete;
> so need to reassign greh;
> but since first calling pskb_may_pull already ensured that skb->data
> has enough space for greh, so move the reference of greh before second
> calling pskb_may_pull(), to avoid reassign greh.
> 
> Fixes: 7a7ffbabf9("ipv4: fix tunneled VM traffic over hw VXLAN/GRE GSO NIC")
> Cc: Wei-Chun Chao <weichunc@plumgrid.com>
> Signed-off-by: Li RongQing <roy.qing.li@gmail.com>

Applied.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/net/ipv4/gre_offload.c b/net/ipv4/gre_offload.c
index a777295..ccda096 100644
--- a/net/ipv4/gre_offload.c
+++ b/net/ipv4/gre_offload.c
@@ -55,13 +55,13 @@  static struct sk_buff *gre_gso_segment(struct sk_buff *skb,
 	if (csum)
 		skb->encap_hdr_csum = 1;
 
-	if (unlikely(!pskb_may_pull(skb, ghl)))
-		goto out;
-
 	/* setup inner skb. */
 	skb->protocol = greh->protocol;
 	skb->encapsulation = 0;
 
+	if (unlikely(!pskb_may_pull(skb, ghl)))
+		goto out;
+
 	__skb_pull(skb, ghl);
 	skb_reset_mac_header(skb);
 	skb_set_network_header(skb, skb_inner_network_offset(skb));