aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCong Wang <[email protected]>2017-11-02 17:32:08 -0700
committerDavid S. Miller <[email protected]>2017-11-03 21:31:15 +0900
commit8f918d3ff4a1283a1693afe2b4c8e1844674ca15 (patch)
tree63b2a6ab926d369762e0b7e0bbfaa205a81f4471
parentf67971e683e81d7ba4739728511ae6e52a1b6321 (diff)
net_sched: check NULL in tcf_block_put()
Callers of tcf_block_put() could pass NULL so we can't use block->q before checking if block is NULL or not. tcf_block_put_ext() callers are fine, it is always non-NULL. Fixes: 8c4083b30e56 ("net: sched: add block bind/unbind notif. and extended block_get/put") Reported-by: Dave Taht <[email protected]> Cc: Jiri Pirko <[email protected]> Signed-off-by: Cong Wang <[email protected]> Reviewed-by: Jiri Pirko <[email protected]> Signed-off-by: David S. Miller <[email protected]>
-rw-r--r--net/sched/cls_api.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c
index 3364347bc699..8d1885abee83 100644
--- a/net/sched/cls_api.c
+++ b/net/sched/cls_api.c
@@ -340,9 +340,6 @@ void tcf_block_put_ext(struct tcf_block *block,
{
struct tcf_chain *chain, *tmp;
- if (!block)
- return;
-
list_for_each_entry_safe(chain, tmp, &block->chain_list, list)
tcf_chain_flush(chain);
@@ -362,6 +359,8 @@ void tcf_block_put(struct tcf_block *block)
{
struct tcf_block_ext_info ei = {0, };
+ if (!block)
+ return;
tcf_block_put_ext(block, NULL, block->q, &ei);
}