]> git.baikalelectronics.ru Git - kernel.git/commitdiff
xen-netfront: cast grant table reference first to type int
authorDongli Zhang <dongli.zhang@oracle.com>
Wed, 2 Nov 2016 01:04:33 +0000 (09:04 +0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 2 Nov 2016 19:33:36 +0000 (15:33 -0400)
IS_ERR_VALUE() in commit 79bb99af76b3787c649d693c61923168fb85a53b
("xen-netfront: do not cast grant table reference to signed short") would
not return true for error code unless we cast ref first to type int.

Signed-off-by: Dongli Zhang <dongli.zhang@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/xen-netfront.c

index 189a28dcd80db005d11cdb9e699361373f308bed..bf2744e1e3db9436cdf9c5f115a175afcb1ed6b5 100644 (file)
@@ -304,7 +304,7 @@ static void xennet_alloc_rx_buffers(struct netfront_queue *queue)
                queue->rx_skbs[id] = skb;
 
                ref = gnttab_claim_grant_reference(&queue->gref_rx_head);
-               WARN_ON_ONCE(IS_ERR_VALUE((unsigned long)ref));
+               WARN_ON_ONCE(IS_ERR_VALUE((unsigned long)(int)ref));
                queue->grant_rx_ref[id] = ref;
 
                page = skb_frag_page(&skb_shinfo(skb)->frags[0]);
@@ -428,7 +428,7 @@ static void xennet_tx_setup_grant(unsigned long gfn, unsigned int offset,
        id = get_id_from_freelist(&queue->tx_skb_freelist, queue->tx_skbs);
        tx = RING_GET_REQUEST(&queue->tx, queue->tx.req_prod_pvt++);
        ref = gnttab_claim_grant_reference(&queue->gref_tx_head);
-       WARN_ON_ONCE(IS_ERR_VALUE((unsigned long)ref));
+       WARN_ON_ONCE(IS_ERR_VALUE((unsigned long)(int)ref));
 
        gnttab_grant_foreign_access_ref(ref, queue->info->xbdev->otherend_id,
                                        gfn, GNTMAP_readonly);