summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Graf <tgraf@infradead.org>2010-10-31 09:37:38 -0700
committerDavid S. Miller <davem@davemloft.net>2010-10-31 09:37:38 -0700
commit5ec1cea057495b8f10bab0c1396a9d8e46b7b0a8 (patch)
tree2115be233a12ce363f669831f5a2a554bafc8565
parent636f8c6f682ee179ff39c94dc4d0be0ddd6c8cdd (diff)
downloadop-kernel-dev-5ec1cea057495b8f10bab0c1396a9d8e46b7b0a8.zip
op-kernel-dev-5ec1cea057495b8f10bab0c1396a9d8e46b7b0a8.tar.gz
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>
-rw-r--r--net/sched/em_text.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/sched/em_text.c b/net/sched/em_text.c
index 7632532..ea8f566 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)
OpenPOWER on IntegriCloud