xen-netback: only deinitialized hash if it was initialized
authorPaul Durrant <Paul.Durrant@citrix.com>
Wed, 18 May 2016 14:55:42 +0000 (15:55 +0100)
committerDavid S. Miller <davem@davemloft.net>
Fri, 20 May 2016 21:41:18 +0000 (17:41 -0400)
commitc0fcded2e6879d817cec822b8513a2f6b6e4dfe9
treec7e993fac1aeaeac1b1f0f55f7ed88d2d4fdf667
parente6790fd861100a01838077b9b59bc339a80ee462
xen-netback: only deinitialized hash if it was initialized

A domain with a frontend that does not implement a control ring has been
seen to cause a crash during domain save. This was apparently because
the call to xenvif_deinit_hash() in xenvif_disconnect_ctrl() is made
regardless of whether a control ring was connected, and hence
xenvif_hash_init() was called.

This patch brings the call to xenvif_deinit_hash() in
xenvif_disconnect_ctrl() inside the if clause that checks whether the
control ring event channel was connected. This is sufficient to ensure
it is only called if xenvif_init_hash() was called previously.

Signed-off-by: Paul Durrant <paul.durrant@citrix.com>
Reported-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Tested-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Cc: Wei Liu <wei.liu2@citrix.com>
Acked-by: Wei Liu <wei.liu2@citrix.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/xen-netback/interface.c