From 8d592c4f1f34cf5eed16f9b6da301acf3267117d Mon Sep 17 00:00:00 2001 From: Michal Miroslaw Date: Fri, 28 Sep 2007 14:45:27 -0700 Subject: [PATCH] --- yaml --- r: 66826 b: refs/heads/master c: aace57e054e9322e20af52cede7de46ade64a5e2 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/netfilter/nfnetlink_log.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index d8e29fd24326..12832e26361d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c6a8f648362a5d8b934f4267b0ab9f255c130ab0 +refs/heads/master: aace57e054e9322e20af52cede7de46ade64a5e2 diff --git a/trunk/net/netfilter/nfnetlink_log.c b/trunk/net/netfilter/nfnetlink_log.c index d2e811f46067..16ae53918606 100644 --- a/trunk/net/netfilter/nfnetlink_log.c +++ b/trunk/net/netfilter/nfnetlink_log.c @@ -152,6 +152,11 @@ instance_create(u_int16_t group_num, int pid) if (!inst) goto out_unlock; + if (!try_module_get(THIS_MODULE)) { + kfree(inst); + goto out_unlock; + } + INIT_HLIST_NODE(&inst->hlist); spin_lock_init(&inst->lock); /* needs to be two, since we _put() after creation */ @@ -168,9 +173,6 @@ instance_create(u_int16_t group_num, int pid) inst->copy_mode = NFULNL_COPY_PACKET; inst->copy_range = 0xffff; - if (!try_module_get(THIS_MODULE)) - goto out_free; - hlist_add_head(&inst->hlist, &instance_table[instance_hashfn(group_num)]); @@ -181,8 +183,6 @@ instance_create(u_int16_t group_num, int pid) return inst; -out_free: - instance_put(inst); out_unlock: write_unlock_bh(&instances_lock); return NULL;