]> git.karo-electronics.de Git - karo-tx-linux.git/commit
INET_DIAG: Fix inet_diag_lock_handler error path.
authorArnaldo Carvalho de Melo <acme@redhat.com>
Fri, 15 Feb 2008 09:41:34 +0000 (01:41 -0800)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 26 Feb 2008 00:18:41 +0000 (16:18 -0800)
commit4450ae03346faceb80a45b4d696c15f981080916
tree850b2d17c27ac661001249f5d3bac9311a8108fd
parent363c11d7e1c2b2cc30e33416a518cea5ef9e0cc8
INET_DIAG: Fix inet_diag_lock_handler error path.

Upstream commit: 8cf8e5a67fb07f583aac94482ba51a7930dab493

Fixes: http://bugzilla.kernel.org/show_bug.cgi?id=9825
The inet_diag_lock_handler function uses ERR_PTR to encode errors but
its callers were testing against NULL.

This only happens when the only inet_diag modular user, DCCP, is not
built into the kernel or available as a module.

Also there was a problem with not dropping the mutex lock when a handler
was not found, also fixed in this patch.

This caused an OOPS and ss would then hang on subsequent calls, as
&inet_diag_table_mutex was being left locked.

Thanks to spike at ml.yaroslavl.ru for report it after trying 'ss -d'
on a kernel that doesn't have DCCP available.

This bug was introduced in cset
d523a328fb0271e1a763e985a21f2488fd816e7e ("Fix inet_diag dead-lock
regression"), after 2.6.24-rc3, so just 2.6.24 seems to be affected.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Acked-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
net/ipv4/inet_diag.c