diff options
author | Davide Caratti <dcaratti@redhat.com> | 2018-03-19 15:31:27 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-03-21 23:12:27 +0100 |
commit | d7f20015736048f494988093b59fe513dc232ce9 (patch) | |
tree | 0d896a8d0fef849b6e1ce071ad81a99bb24cc8e0 /net/sched/act_skbmod.c | |
parent | net/sched: fix idr leak in the error path of __tcf_ipt_init() (diff) | |
download | linux-d7f20015736048f494988093b59fe513dc232ce9.tar.xz linux-d7f20015736048f494988093b59fe513dc232ce9.zip |
net/sched: fix idr leak in the error path of tcf_vlan_init()
tcf_vlan_init() can fail after the idr has been successfully reserved.
When this happens, every subsequent attempt to configure vlan rules using
the same idr value will systematically fail with -ENOSPC, unless the first
attempt was done using the 'replace' keyword.
# tc action add action vlan pop index 100
RTNETLINK answers: Cannot allocate memory
We have an error talking to the kernel
# tc action add action vlan pop index 100
RTNETLINK answers: No space left on device
We have an error talking to the kernel
# tc action add action vlan pop index 100
RTNETLINK answers: No space left on device
We have an error talking to the kernel
...
Fix this in tcf_vlan_init(), ensuring that tcf_idr_release() is called on
the error path when the idr has been reserved, but not yet inserted. Also,
don't test 'ovr' in the error path, to avoid a 'replace' failure implicitly
become a 'delete' that leaks refcount in act_vlan module:
# rmmod act_vlan; modprobe act_vlan
# tc action add action vlan push id 5 index 100
# tc action replace action vlan push id 7 index 100
RTNETLINK answers: Cannot allocate memory
We have an error talking to the kernel
# tc action list action vlan
#
# rmmod act_vlan
rmmod: ERROR: Module act_vlan is in use
Fixes: 4c5b9d9642c8 ("act_vlan: VLAN action rewrite to use RCU lock/unlock and update")
Fixes: 65a206c01e8e ("net/sched: Change act_api and act_xxx modules to use IDR")
Acked-by: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: Davide Caratti <dcaratti@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/act_skbmod.c')
0 files changed, 0 insertions, 0 deletions