net sched actions: decrement module reference count after table flush.

commit edb9d1bff4bbe19b8ae0e71b1f38732591a9eeb2 upstream.

When tc actions are loaded as a module and no actions have been installed,
flushing them would result in actions removed from the memory, but modules
reference count not being decremented, so that the modules would not be
unloaded.

Following is example with GACT action:

% sudo modprobe act_gact
% lsmod
Module                  Size  Used by
act_gact               16384  0
%
% sudo tc actions ls action gact
%
% sudo tc actions flush action gact
% lsmod
Module                  Size  Used by
act_gact               16384  1
% sudo tc actions flush action gact
% lsmod
Module                  Size  Used by
act_gact               16384  2
% sudo rmmod act_gact
rmmod: ERROR: Module act_gact is in use
....

After the fix:
% lsmod
Module                  Size  Used by
act_gact               16384  0
%
% sudo tc actions add action pass index 1
% sudo tc actions add action pass index 2
% sudo tc actions add action pass index 3
% lsmod
Module                  Size  Used by
act_gact               16384  3
%
% sudo tc actions flush action gact
% lsmod
Module                  Size  Used by
act_gact               16384  0
%
% sudo tc actions flush action gact
% lsmod
Module                  Size  Used by
act_gact               16384  0
% sudo rmmod act_gact
% lsmod
Module                  Size  Used by
%

Fixes: f97017cdefef ("net-sched: Fix actions flushing")
Signed-off-by: Roman Mashak <mrv@mojatatu.com>
Signed-off-by: Jamal Hadi Salim <jhs@mojatatu.com>
Acked-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
[bwh: Backported to 3.2: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>

diff --git a/net/sched/act_api.c b/net/sched/act_api.c
index 93fdf13..943e1c5 100644 (file)
--- a/net/sched/act_api.c
+++ b/net/sched/act_api.c
@@ -807,10 +807,8 @@ static int tca_action_flush(struct net *net, struct nlattr *nla,
                goto nla_put_failure;
 
        err = a->ops->walk(skb, &dcb, RTM_DELACTION, a);
                goto nla_put_failure;
 
        err = a->ops->walk(skb, &dcb, RTM_DELACTION, a);

-       if (err < 0)
+       if (err <= 0)

                goto nla_put_failure;
                goto nla_put_failure;

-       if (err == 0)
-               goto noflush_out;

 
        nla_nest_end(skb, nest);
 
 
        nla_nest_end(skb, nest);
 


@@ -829,7 +827,6 @@ nla_put_failure:
 nlmsg_failure:
        module_put(a->ops->owner);
 err_out:
 nlmsg_failure:
        module_put(a->ops->owner);
 err_out:

-noflush_out:

        kfree_skb(skb);
        kfree(a);
        return err;
        kfree_skb(skb);
        kfree(a);
        return err;