Commit 94f950c4 authored by Jan Beulich's avatar Jan Beulich Committed by David S. Miller

xen-netback: don't de-reference vif pointer after having called xenvif_put()

When putting vif-s on the rx notify list, calling xenvif_put() must be
deferred until after the removal from the list and the issuing of the
notification, as both operations dereference the pointer.

Changing this got me to notice that the "irq" variable was effectively
unused (and was of too narrow type anyway).
Signed-off-by: default avatarJan Beulich <jbeulich@suse.com>
Acked-by: default avatarIan Campbell <ian.campbell@citrix.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 99ffc3e7
...@@ -662,7 +662,7 @@ static void xen_netbk_rx_action(struct xen_netbk *netbk) ...@@ -662,7 +662,7 @@ static void xen_netbk_rx_action(struct xen_netbk *netbk)
{ {
struct xenvif *vif = NULL, *tmp; struct xenvif *vif = NULL, *tmp;
s8 status; s8 status;
u16 irq, flags; u16 flags;
struct xen_netif_rx_response *resp; struct xen_netif_rx_response *resp;
struct sk_buff_head rxq; struct sk_buff_head rxq;
struct sk_buff *skb; struct sk_buff *skb;
...@@ -771,12 +771,12 @@ static void xen_netbk_rx_action(struct xen_netbk *netbk) ...@@ -771,12 +771,12 @@ static void xen_netbk_rx_action(struct xen_netbk *netbk)
sco->meta_slots_used); sco->meta_slots_used);
RING_PUSH_RESPONSES_AND_CHECK_NOTIFY(&vif->rx, ret); RING_PUSH_RESPONSES_AND_CHECK_NOTIFY(&vif->rx, ret);
irq = vif->irq;
if (ret && list_empty(&vif->notify_list))
list_add_tail(&vif->notify_list, &notify);
xenvif_notify_tx_completion(vif); xenvif_notify_tx_completion(vif);
if (ret && list_empty(&vif->notify_list))
list_add_tail(&vif->notify_list, &notify);
else
xenvif_put(vif); xenvif_put(vif);
npo.meta_cons += sco->meta_slots_used; npo.meta_cons += sco->meta_slots_used;
dev_kfree_skb(skb); dev_kfree_skb(skb);
...@@ -785,6 +785,7 @@ static void xen_netbk_rx_action(struct xen_netbk *netbk) ...@@ -785,6 +785,7 @@ static void xen_netbk_rx_action(struct xen_netbk *netbk)
list_for_each_entry_safe(vif, tmp, &notify, notify_list) { list_for_each_entry_safe(vif, tmp, &notify, notify_list) {
notify_remote_via_irq(vif->irq); notify_remote_via_irq(vif->irq);
list_del_init(&vif->notify_list); list_del_init(&vif->notify_list);
xenvif_put(vif);
} }
/* More work to do? */ /* More work to do? */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment