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

Commit c0fcded2 authored by Paul Durrant's avatar Paul Durrant Committed by David S. Miller
Browse files

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: default avatarPaul Durrant <paul.durrant@citrix.com>
Reported-by: default avatarBoris Ostrovsky <boris.ostrovsky@oracle.com>
Tested-by: default avatarBoris Ostrovsky <boris.ostrovsky@oracle.com>
Cc: Wei Liu <wei.liu2@citrix.com>
Acked-by: default avatarWei Liu <wei.liu2@citrix.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e6790fd8

drivers/net/xen-netback/interface.c

+1 −2
Original line number Diff line number Diff line
@@ -780,9 +780,8 @@ void xenvif_disconnect_ctrl(struct xenvif *vif) 
		vif->ctrl_task = NULL;

	}



	xenvif_deinit_hash(vif);



	if (vif->ctrl_irq) {

		xenvif_deinit_hash(vif);

		unbind_from_irqhandler(vif->ctrl_irq, vif);

		vif->ctrl_irq = 0;

	}