Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b6f0a365 authored by Eric Dumazet's avatar Eric Dumazet Committed by Patrick McHardy
Browse files

netfilter: nf_log regression fix 



commit ca735b3a
'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: default avatarMariusz Kozlowski <m.kozlowski@tuxland.pl>
Signed-off-by: default avatarEric Dumazet <dada1@cosmosbay.com>
Acked-by: default avatarEric Leblond <eric@inl.fr>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parent 83731671

net/netfilter/nf_log.c

+4 −0
Original line number Diff line number Diff line
@@ -36,10 +36,14 @@ static struct nf_logger *__find_logger(int pf, const char *str_logger) 
int nf_log_register(u_int8_t pf, struct nf_logger *logger)

{

	const struct nf_logger *llog;

	int i;



	if (pf >= ARRAY_SIZE(nf_loggers))

		return -EINVAL;



	for (i = 0; i < ARRAY_SIZE(logger->list); i++)

		INIT_LIST_HEAD(&logger->list[i]);



	mutex_lock(&nf_log_mutex);



	if (pf == NFPROTO_UNSPEC) {