* [patch -next] geneve: testing the wrong variable in geneve6_build_skb()
@ 2016-04-19 14:30 Dan Carpenter
2016-04-19 17:57 ` Alexander Duyck
2016-04-21 18:08 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Dan Carpenter @ 2016-04-19 14:30 UTC (permalink / raw)
To: David S. Miller, Alexander Duyck
Cc: Jesse Gross, John W. Linville, Pravin B Shelar, Jiri Benc,
Daniel Borkmann, Tom Herbert, netdev, kernel-janitors
We intended to test "err" and not "skb".
Fixes: aed069df099c ('ip_tunnel_core: iptunnel_handle_offloads returns int and doesn't free skb')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/drivers/net/geneve.c b/drivers/net/geneve.c
index efbc7ce..512dbe0 100644
--- a/drivers/net/geneve.c
+++ b/drivers/net/geneve.c
@@ -733,7 +733,7 @@ static int geneve6_build_skb(struct dst_entry *dst, struct sk_buff *skb,
goto free_dst;
err = udp_tunnel_handle_offloads(skb, udp_sum);
- if (IS_ERR(skb))
+ if (err)
goto free_dst;
gnvh = (struct genevehdr *)__skb_push(skb, sizeof(*gnvh) + opt_len);
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [patch -next] geneve: testing the wrong variable in geneve6_build_skb()
2016-04-19 14:30 [patch -next] geneve: testing the wrong variable in geneve6_build_skb() Dan Carpenter
@ 2016-04-19 17:57 ` Alexander Duyck
2016-04-21 18:08 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Alexander Duyck @ 2016-04-19 17:57 UTC (permalink / raw)
To: Dan Carpenter
Cc: David S. Miller, Alexander Duyck, Jesse Gross, John W. Linville,
Pravin B Shelar, Jiri Benc, Daniel Borkmann, Tom Herbert, Netdev,
kernel-janitors
On Tue, Apr 19, 2016 at 7:30 AM, Dan Carpenter <dan.carpenter@oracle.com> wrote:
> We intended to test "err" and not "skb".
>
> Fixes: aed069df099c ('ip_tunnel_core: iptunnel_handle_offloads returns int and doesn't free skb')
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>
> diff --git a/drivers/net/geneve.c b/drivers/net/geneve.c
> index efbc7ce..512dbe0 100644
> --- a/drivers/net/geneve.c
> +++ b/drivers/net/geneve.c
> @@ -733,7 +733,7 @@ static int geneve6_build_skb(struct dst_entry *dst, struct sk_buff *skb,
> goto free_dst;
>
> err = udp_tunnel_handle_offloads(skb, udp_sum);
> - if (IS_ERR(skb))
> + if (err)
> goto free_dst;
>
> gnvh = (struct genevehdr *)__skb_push(skb, sizeof(*gnvh) + opt_len);
Yeah, this looks like I missed a spot. Thanks for catching this.
Acked-by: Alexander Duyck <aduyck@mirantis.com>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [patch -next] geneve: testing the wrong variable in geneve6_build_skb()
2016-04-19 14:30 [patch -next] geneve: testing the wrong variable in geneve6_build_skb() Dan Carpenter
2016-04-19 17:57 ` Alexander Duyck
@ 2016-04-21 18:08 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2016-04-21 18:08 UTC (permalink / raw)
To: dan.carpenter
Cc: aduyck, jesse, linville, pshelar, jbenc, daniel, tom, netdev,
kernel-janitors
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Tue, 19 Apr 2016 17:30:56 +0300
> We intended to test "err" and not "skb".
>
> Fixes: aed069df099c ('ip_tunnel_core: iptunnel_handle_offloads returns int and doesn't free skb')
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Applied, thanks Dan.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-04-21 18:08 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-04-19 14:30 [patch -next] geneve: testing the wrong variable in geneve6_build_skb() Dan Carpenter
2016-04-19 17:57 ` Alexander Duyck
2016-04-21 18:08 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).