fib_trie: Fix regression in handling of inflate/halve failure
authorAlexander Duyck <alexander.h.duyck@redhat.com>
Mon, 23 Mar 2015 18:51:53 +0000 (11:51 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 23 Mar 2015 20:58:32 +0000 (16:58 -0400)
commitb6f15f828d4b624a2e4306dabbbb20a581bece37
tree78a27659a48bc7be32ef10407be3dfc21c440797
parent9cde94506eacfcda570b6c304b8deae1a7191ee2
fib_trie: Fix regression in handling of inflate/halve failure

When I updated the code to address a possible null pointer dereference in
resize I ended up reverting an exception handling fix for the suffix length
in the event that inflate or halve failed.  This change is meant to correct
that by reverting the earlier fix and instead simply getting the parent
again after inflate has been completed to avoid the possible null pointer
issue.

Fixes: ddb4b9a13 ("fib_trie: Address possible NULL pointer dereference in resize")
Signed-off-by: Alexander Duyck <alexander.h.duyck@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/fib_trie.c