]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
net: sched: act_ipt: remove dependency on rtnl lock
authorVlad Buslov <vladbu@mellanox.com>
Fri, 10 Aug 2018 17:51:45 +0000 (20:51 +0300)
committerDavid S. Miller <davem@davemloft.net>
Sat, 11 Aug 2018 19:37:09 +0000 (12:37 -0700)
Use tcf spinlock to protect ipt action private data from concurrent
modification during dump. Ipt init already takes tcf spinlock when
modifying ipt state.

Signed-off-by: Vlad Buslov <vladbu@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/sched/act_ipt.c

index 0dc787a57798292be40ba1f66c16d2affd31a046..e149f0e66cb6c02cc956d817ed1e4c98901cec9f 100644 (file)
@@ -288,6 +288,7 @@ static int tcf_ipt_dump(struct sk_buff *skb, struct tc_action *a, int bind,
         * for foolproof you need to not assume this
         */
 
+       spin_lock_bh(&ipt->tcf_lock);
        t = kmemdup(ipt->tcfi_t, ipt->tcfi_t->u.user.target_size, GFP_ATOMIC);
        if (unlikely(!t))
                goto nla_put_failure;
@@ -307,10 +308,12 @@ static int tcf_ipt_dump(struct sk_buff *skb, struct tc_action *a, int bind,
        if (nla_put_64bit(skb, TCA_IPT_TM, sizeof(tm), &tm, TCA_IPT_PAD))
                goto nla_put_failure;
 
+       spin_unlock_bh(&ipt->tcf_lock);
        kfree(t);
        return skb->len;
 
 nla_put_failure:
+       spin_unlock_bh(&ipt->tcf_lock);
        nlmsg_trim(skb, b);
        kfree(t);
        return -1;