|
@@ -960,7 +960,7 @@ static int ip_set_create(struct net *net, struct sock *ctnl,
|
|
|
/* Wraparound */
|
|
|
goto cleanup;
|
|
|
|
|
|
- list = kcalloc(i, sizeof(struct ip_set *), GFP_KERNEL);
|
|
|
+ list = kvcalloc(i, sizeof(struct ip_set *), GFP_KERNEL);
|
|
|
if (!list)
|
|
|
goto cleanup;
|
|
|
/* nfnl mutex is held, both lists are valid */
|
|
@@ -972,7 +972,7 @@ static int ip_set_create(struct net *net, struct sock *ctnl,
|
|
|
/* Use new list */
|
|
|
index = inst->ip_set_max;
|
|
|
inst->ip_set_max = i;
|
|
|
- kfree(tmp);
|
|
|
+ kvfree(tmp);
|
|
|
ret = 0;
|
|
|
} else if (ret) {
|
|
|
goto cleanup;
|
|
@@ -2058,7 +2058,7 @@ ip_set_net_init(struct net *net)
|
|
|
if (inst->ip_set_max >= IPSET_INVALID_ID)
|
|
|
inst->ip_set_max = IPSET_INVALID_ID - 1;
|
|
|
|
|
|
- list = kcalloc(inst->ip_set_max, sizeof(struct ip_set *), GFP_KERNEL);
|
|
|
+ list = kvcalloc(inst->ip_set_max, sizeof(struct ip_set *), GFP_KERNEL);
|
|
|
if (!list)
|
|
|
return -ENOMEM;
|
|
|
inst->is_deleted = false;
|
|
@@ -2086,7 +2086,7 @@ ip_set_net_exit(struct net *net)
|
|
|
}
|
|
|
}
|
|
|
nfnl_unlock(NFNL_SUBSYS_IPSET);
|
|
|
- kfree(rcu_dereference_protected(inst->ip_set_list, 1));
|
|
|
+ kvfree(rcu_dereference_protected(inst->ip_set_list, 1));
|
|
|
}
|
|
|
|
|
|
static struct pernet_operations ip_set_net_ops = {
|