diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2016-01-04 10:25:34 -0500 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2016-01-04 10:25:34 -0500 |
| commit | 7e935c7ca1e6c398f11edac5beabfc4348e3b3a4 (patch) | |
| tree | 86da864ba6341bd86b5f5450c611f918722237b2 /drivers/infiniband/core/cma.c | |
| parent | c62432b40b5e03c25faf2c8f8547bba4908b8945 (diff) | |
| parent | e9d408e107db9a554b36c3a79f67b37dd3e16da0 (diff) | |
| download | op-kernel-dev-7e935c7ca1e6c398f11edac5beabfc4348e3b3a4.zip op-kernel-dev-7e935c7ca1e6c398f11edac5beabfc4348e3b3a4.tar.gz | |
Merge branch 'memdup_user_nul' into work.misc
Diffstat (limited to 'drivers/infiniband/core/cma.c')
| -rw-r--r-- | drivers/infiniband/core/cma.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c index 944cd90..d2d5d00 100644 --- a/drivers/infiniband/core/cma.c +++ b/drivers/infiniband/core/cma.c @@ -1126,10 +1126,7 @@ static bool validate_ipv4_net_dev(struct net_device *net_dev, rcu_read_lock(); err = fib_lookup(dev_net(net_dev), &fl4, &res, 0); - if (err) - return false; - - ret = FIB_RES_DEV(res) == net_dev; + ret = err == 0 && FIB_RES_DEV(res) == net_dev; rcu_read_unlock(); return ret; |
