diff options
| author |   Mahesh Bandewar <maheshb@google.com> | 2015-01-24 21:53:43 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-01-25 00:24:19 -0800 |
| commit | 2aab9525c365048e55b40102c9b69dcb43425d8d (patch) | |
| tree | 37cdd1cf7aace46590eeffad43ab2de51e1189fe /drivers/net/ipvlan | |
| parent | net: llc: use correct size for sysctl timeout entries (diff) | |
| download | linux-dev-2aab9525c365048e55b40102c9b69dcb43425d8d.tar.xz linux-dev-2aab9525c365048e55b40102c9b69dcb43425d8d.zip | |
ipvlan: fix incorrect usage of IS_ERR() macro in IPv6 code path.
The ip6_route_output() always returns a valid dst pointer unlike in IPv4
case. So the validation has to be different from the IPv4 path. Correcting
that error in this patch.
This was picked up by a static checker with a following warning -
drivers/net/ipvlan/ipvlan_core.c:380 ipvlan_process_v6_outbound()
warn: 'dst' isn't an ERR_PTR
Signed-off-by: Mahesh Bandewar <maheshb@google.com>
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ipvlan')
| -rw-r--r-- | drivers/net/ipvlan/ipvlan_core.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/ipvlan/ipvlan_core.c b/drivers/net/ipvlan/ipvlan_core.c index a14d87783245..2e195289ddf4 100644 --- a/drivers/net/ipvlan/ipvlan_core.c +++ b/drivers/net/ipvlan/ipvlan_core.c @@ -377,9 +377,11 @@ static int ipvlan_process_v6_outbound(struct sk_buff *skb) }; dst = ip6_route_output(dev_net(dev), NULL, &fl6); - if (IS_ERR(dst)) + if (dst->error) { + ret = dst->error; + dst_release(dst); goto err; - + } skb_dst_drop(skb); skb_dst_set(skb, dst); err = ip6_local_out(skb); |