diff options
| author | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2015-03-29 12:13:53 +0200 |
|---|---|---|
| committer | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2015-03-29 16:55:20 +0200 |
| commit | aa458c2dd4eacd822f8b55d929f69697dc50bdf1 (patch) | |
| tree | 6e0671ec02d0c75aea944ce19c8e7268ac66e44f /kernel/net/netfilter/ipset/ip_set_list_set.c | |
| parent | fde037966a25e8549b8c76c2940a74dd0f39688c (diff) | |
RCU safe comment extension handling
Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Diffstat (limited to 'kernel/net/netfilter/ipset/ip_set_list_set.c')
| -rw-r--r-- | kernel/net/netfilter/ipset/ip_set_list_set.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/kernel/net/netfilter/ipset/ip_set_list_set.c b/kernel/net/netfilter/ipset/ip_set_list_set.c index 8edadb5..0b88000 100644 --- a/kernel/net/netfilter/ipset/ip_set_list_set.c +++ b/kernel/net/netfilter/ipset/ip_set_list_set.c @@ -478,6 +478,7 @@ list_set_list(const struct ip_set *set, struct nlattr *atd, *nested; u32 i = 0, first = cb->args[IPSET_CB_ARG0]; struct set_elem *e; + int ret = 0; atd = ipset_nest_start(skb, IPSET_ATTR_ADT); if (!atd) @@ -488,6 +489,7 @@ list_set_list(const struct ip_set *set, i++; } + rcu_read_lock(); list_for_each_entry_from(e, &map->members, list) { i++; if (SET_WITH_TIMEOUT(set) && @@ -497,7 +499,8 @@ list_set_list(const struct ip_set *set, if (!nested) { if (i == first) { nla_nest_cancel(skb, atd); - return -EMSGSIZE; + ret = -EMSGSIZE; + goto out; } goto nla_put_failure; } @@ -512,17 +515,19 @@ list_set_list(const struct ip_set *set, ipset_nest_end(skb, atd); /* Set listing finished */ cb->args[IPSET_CB_ARG0] = 0; - return 0; + goto out; nla_put_failure: nla_nest_cancel(skb, nested); if (unlikely(i == first)) { cb->args[IPSET_CB_ARG0] = 0; - return -EMSGSIZE; + ret = -EMSGSIZE; } cb->args[IPSET_CB_ARG0] = i - 1; ipset_nest_end(skb, atd); - return 0; +out: + rcu_read_unlock(); + return ret; } static bool |