diff options
| author |   Pablo Neira Ayuso <pablo@netfilter.org> | 2016-12-04 20:46:16 +0100 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2016-12-04 20:46:16 +0100 |
| commit | f6b3ef5e380d5eba61e4e91a3c26ed7fd2b67347 (patch) | |
| tree | 93fe3856bb285ac1df7aab655c85add66ebe0b98 /net/netfilter/ipvs/ip_vs_ctl.c | |
| parent | netfilter: nfnetlink_log: add "nf-logger-5-1" module alias name (diff) | |
| parent | ipvs: Decrement ttl (diff) | |
| download | linux-dev-f6b3ef5e380d5eba61e4e91a3c26ed7fd2b67347.tar.xz linux-dev-f6b3ef5e380d5eba61e4e91a3c26ed7fd2b67347.zip | |
Merge tag 'ipvs-for-v4.10' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next
Simon Horman says:
====================
IPVS Updates for v4.10
please consider these enhancements to the IPVS for v4.10.
* Decrement the IP ttl in all the modes in order to prevent infinite
route loops. Thanks to Dwip Banerjee.
* Use IS_ERR_OR_NULL macro. Clean-up from Gao Feng.
====================
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/netfilter/ipvs/ip_vs_ctl.c')
| -rw-r--r-- | net/netfilter/ipvs/ip_vs_ctl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c index 038c2ba0ae0f..3d02b0c13547 100644 --- a/net/netfilter/ipvs/ip_vs_ctl.c +++ b/net/netfilter/ipvs/ip_vs_ctl.c @@ -3260,7 +3260,7 @@ static int ip_vs_genl_dump_dests(struct sk_buff *skb, svc = ip_vs_genl_find_service(ipvs, attrs[IPVS_CMD_ATTR_SERVICE]); - if (IS_ERR(svc) || svc == NULL) + if (IS_ERR_OR_NULL(svc)) goto out_err; /* Dump the destinations */ |