diff options
| author | Thomas Graf <tgraf@infradead.org> | 2010-10-31 17:37:38 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-10-31 17:37:38 +0100 |
| commit | 5ec1cea057495b8f10bab0c1396a9d8e46b7b0a8 (patch) | |
| tree | 2115be233a12ce363f669831f5a2a554bafc8565 /net/sched/em_text.c | |
| parent | qlcnic: fix panic on load (diff) | |
| download | linux-5ec1cea057495b8f10bab0c1396a9d8e46b7b0a8.tar.xz linux-5ec1cea057495b8f10bab0c1396a9d8e46b7b0a8.zip | |
text ematch: check for NULL pointer before destroying textsearch config
While validating the configuration em_ops is already set, thus the
individual destroy functions are called, but the ematch data has
not been allocated and associated with the ematch yet.
Signed-off-by: Thomas Graf <tgraf@infradead.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/em_text.c')
| -rw-r--r-- | net/sched/em_text.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/sched/em_text.c b/net/sched/em_text.c index 763253257411..ea8f566e720c 100644 --- a/net/sched/em_text.c +++ b/net/sched/em_text.c @@ -103,7 +103,8 @@ retry: static void em_text_destroy(struct tcf_proto *tp, struct tcf_ematch *m) { - textsearch_destroy(EM_TEXT_PRIV(m)->config); + if (EM_TEXT_PRIV(m) && EM_TEXT_PRIV(m)->config) + textsearch_destroy(EM_TEXT_PRIV(m)->config); } static int em_text_dump(struct sk_buff *skb, struct tcf_ematch *m) |