| Message ID | 20160419143056.GD4876@mwanda |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
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>
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.
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);
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>