From a30681c56c04c870fd3a0910b552d03536656147 Mon Sep 17 00:00:00 2001 From: Thomas Graf Date: Sun, 31 Oct 2010 09:37:38 -0700 Subject: [PATCH] --- yaml --- r: 221602 b: refs/heads/master c: 5ec1cea057495b8f10bab0c1396a9d8e46b7b0a8 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/sched/em_text.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f8e0bbf4082b..560d286e0ff4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 636f8c6f682ee179ff39c94dc4d0be0ddd6c8cdd +refs/heads/master: 5ec1cea057495b8f10bab0c1396a9d8e46b7b0a8 diff --git a/trunk/net/sched/em_text.c b/trunk/net/sched/em_text.c index 763253257411..ea8f566e720c 100644 --- a/trunk/net/sched/em_text.c +++ b/trunk/net/sched/em_text.c @@ -103,7 +103,8 @@ static int em_text_change(struct tcf_proto *tp, void *data, int len, 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)