fib_trie: Address possible NULL pointer dereference in resize
authorAlexander Duyck <alexander.h.duyck@redhat.com>
Tue, 10 Mar 2015 21:39:34 +0000 (14:39 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 10 Mar 2015 22:36:56 +0000 (18:36 -0400)
commitddb4b9a1328ea89733133e86cf1972d23891abfc
tree39e6b01f93a37c97fa6721ff7fa0976cd44a0555
parent416377ea392823e8ea1f8a10477e7d08a9bb715e
fib_trie: Address possible NULL pointer dereference in resize

If the inflate call failed it would return NULL.  As a result tp would be
set to NULL and cause use to trigger a NULL pointer dereference in
should_halve if the inflate failed on the first attempt.

In order to prevent this we should decrement max_work before we actually
attempt to inflate as this will force us to exit before attempting to halve
a node we should have inflated.  In order to keep things symmetric between
inflate and halve I went ahead and also moved the decrement of max_work for
the halve case as well so we take care of that before we actually attempt
to halve the tnode.

Fixes: 88bae714 ("fib_trie: Add key vector to root, return parent key_vector in resize")
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Alexander Duyck <alexander.h.duyck@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/fib_trie.c