diff options
author | Eric Dumazet <dada1@cosmosbay.com> | 2009-04-15 06:16:19 -0400 |
---|---|---|
committer | Patrick McHardy <kaber@trash.net> | 2009-04-15 06:16:19 -0400 |
commit | b6f0a3652ea9d2296fdc98c3b2c96603be611c4d (patch) | |
tree | 336629eb6d6219133ee9cca312c16a6e66bb5fa0 /net/netfilter | |
parent | 83731671d9e6878c0a05d309c68fb71c16d3235a (diff) |
netfilter: nf_log regression fix
commit ca735b3aaa945626ba65a3e51145bfe4ecd9e222
'netfilter: use a linked list of loggers'
introduced an array of list_head in "struct nf_logger", but
forgot to initialize it in nf_log_register(). This resulted
in oops when calling nf_log_unregister() at module unload time.
Reported-and-tested-by: Mariusz Kozlowski <m.kozlowski@tuxland.pl>
Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>
Acked-by: Eric Leblond <eric@inl.fr>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'net/netfilter')
-rw-r--r-- | net/netfilter/nf_log.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/netfilter/nf_log.c b/net/netfilter/nf_log.c index 8bb998fe098b..beb37311e1a5 100644 --- a/net/netfilter/nf_log.c +++ b/net/netfilter/nf_log.c | |||
@@ -36,10 +36,14 @@ static struct nf_logger *__find_logger(int pf, const char *str_logger) | |||
36 | int nf_log_register(u_int8_t pf, struct nf_logger *logger) | 36 | int nf_log_register(u_int8_t pf, struct nf_logger *logger) |
37 | { | 37 | { |
38 | const struct nf_logger *llog; | 38 | const struct nf_logger *llog; |
39 | int i; | ||
39 | 40 | ||
40 | if (pf >= ARRAY_SIZE(nf_loggers)) | 41 | if (pf >= ARRAY_SIZE(nf_loggers)) |
41 | return -EINVAL; | 42 | return -EINVAL; |
42 | 43 | ||
44 | for (i = 0; i < ARRAY_SIZE(logger->list); i++) | ||
45 | INIT_LIST_HEAD(&logger->list[i]); | ||
46 | |||
43 | mutex_lock(&nf_log_mutex); | 47 | mutex_lock(&nf_log_mutex); |
44 | 48 | ||
45 | if (pf == NFPROTO_UNSPEC) { | 49 | if (pf == NFPROTO_UNSPEC) { |