[Devel] [PATCH RHEL7 COMMIT] vzprivnet: Bad retcode on IP add conflict

[Konstantin Khorenko]

The commit is pushed to "branch-rh7-3.10.0-327.10.1.vz7.12.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-327.10.1.vz7.12.3
------>
commit 80f21ebf9a21ef5ef7203160e4adb647253564bc
Author: Pavel Tikhomirov <ptikhomirov at virtuozzo.com>
Date:   Thu Mar 24 19:53:33 2016 +0400

    vzprivnet: Bad retcode on IP add conflict
    
    Port diff-vz-privnet-addnet-bad-retcode
      vzprivnet: Bad retcode on IP add conflict
    
      The ENOMEM will be reported, but EEXIST is better for that case.
      Taken from 2.6.18-rh5
    
    Signed-off-by: Pavel Tikhomirov <ptikhomirov at virtuozzo.com>
---
 net/ipv4/netfilter/ip_vzprivnet.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/net/ipv4/netfilter/ip_vzprivnet.c b/net/ipv4/netfilter/ip_vzprivnet.c
index 704c38d..e3b7610 100644
--- a/net/ipv4/netfilter/ip_vzprivnet.c
+++ b/net/ipv4/netfilter/ip_vzprivnet.c
@@ -552,6 +552,7 @@ static int sparse_add(unsigned int netid, u32 ip, u32 mask, int weak)
 
 found_net:
 	if (ip != 0) {
+		err = -EEXIST;
 		ip &= mask;
 		list_for_each_entry(tmp, &pns->entries, list) {
 			if ((ip & tmp->range.rmask) == tmp->range.netip)