Browse Source

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>
Thomas Graf 14 years ago
parent
commit
5ec1cea057
1 changed files with 2 additions and 1 deletions
  1. 2 1
      net/sched/em_text.c

+ 2 - 1
net/sched/em_text.c

@@ -103,7 +103,8 @@ retry:
 
 
 static void em_text_destroy(struct tcf_proto *tp, struct tcf_ematch *m)
 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)
 static int em_text_dump(struct sk_buff *skb, struct tcf_ematch *m)