diff options
| author | Jozsef Kadlecsik | 2013-09-30 07:57:18 +0200 |
|---|---|---|
| committer | Jozsef Kadlecsik | 2013-09-30 21:33:26 +0200 |
| commit | 5e04c0c38c90f1f11a0e87800e4c22d4aba1d733 (patch) | |
| tree | 8b8f3229e3934a0c0ff49ba12ea59899d944fe55 /net/netfilter/ipset/ip_set_core.c | |
| parent | netfilter: ipset: order matches and targets separatedly in xt_set.c (diff) | |
| download | kernel-qcow2-linux-5e04c0c38c90f1f11a0e87800e4c22d4aba1d733.tar.gz kernel-qcow2-linux-5e04c0c38c90f1f11a0e87800e4c22d4aba1d733.tar.xz kernel-qcow2-linux-5e04c0c38c90f1f11a0e87800e4c22d4aba1d733.zip | |
netfilter: ipset: Introduce new operation to get both setname and family
ip[6]tables set match and SET target need to know the family of the set
in order to reject adding rules which refer to a set with a non-mathcing
family. Currently such rules are silently accepted and then ignored
instead of generating a clear error message to the user, which is not
helpful.
Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Diffstat (limited to 'net/netfilter/ipset/ip_set_core.c')
| -rw-r--r-- | net/netfilter/ipset/ip_set_core.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/net/netfilter/ipset/ip_set_core.c b/net/netfilter/ipset/ip_set_core.c index f2e30fb31e78..428c30a8586f 100644 --- a/net/netfilter/ipset/ip_set_core.c +++ b/net/netfilter/ipset/ip_set_core.c @@ -1788,6 +1788,23 @@ ip_set_sockfn_get(struct sock *sk, int optval, void __user *user, int *len) nfnl_unlock(NFNL_SUBSYS_IPSET); goto copy; } + case IP_SET_OP_GET_FNAME: { + struct ip_set_req_get_set_family *req_get = data; + ip_set_id_t id; + + if (*len != sizeof(struct ip_set_req_get_set_family)) { + ret = -EINVAL; + goto done; + } + req_get->set.name[IPSET_MAXNAMELEN - 1] = '\0'; + nfnl_lock(NFNL_SUBSYS_IPSET); + find_set_and_id(req_get->set.name, &id); + req_get->set.index = id; + if (id != IPSET_INVALID_ID) + req_get->family = nfnl_set(id)->family; + nfnl_unlock(NFNL_SUBSYS_IPSET); + goto copy; + } case IP_SET_OP_GET_BYINDEX: { struct ip_set_req_get_set *req_get = data; struct ip_set *set; |