lkml.org 
[lkml]   [2018]   [Apr]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3/6] xen-netfront: do not use data already exposed to backend
    Date
    Backend may freely modify anything on shared page, so use data which was
    supposed to be written there, instead of reading it back from the shared
    page.

    This is complementary to XSA155.

    CC: stable@vger.kernel.org
    Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
    ---
    drivers/net/xen-netfront.c | 9 +++++----
    1 file changed, 5 insertions(+), 4 deletions(-)

    diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
    index dc99763..934b8a4 100644
    --- a/drivers/net/xen-netfront.c
    +++ b/drivers/net/xen-netfront.c
    @@ -458,7 +458,7 @@ static void xennet_tx_setup_grant(unsigned long gfn, unsigned int offset,
    tx->flags = 0;

    info->tx = tx;
    - info->size += tx->size;
    + info->size += len;
    }

    static struct xen_netif_tx_request *xennet_make_first_txreq(
    @@ -574,7 +574,7 @@ static int xennet_start_xmit(struct sk_buff *skb, struct net_device *dev)
    int slots;
    struct page *page;
    unsigned int offset;
    - unsigned int len;
    + unsigned int len, this_len;
    unsigned long flags;
    struct netfront_queue *queue = NULL;
    unsigned int num_queues = dev->real_num_tx_queues;
    @@ -634,14 +634,15 @@ static int xennet_start_xmit(struct sk_buff *skb, struct net_device *dev)
    }

    /* First request for the linear area. */
    + this_len = min_t(unsigned int, XEN_PAGE_SIZE - offset, len);
    first_tx = tx = xennet_make_first_txreq(queue, skb,
    page, offset, len);
    - offset += tx->size;
    + offset += this_len;
    if (offset == PAGE_SIZE) {
    page++;
    offset = 0;
    }
    - len -= tx->size;
    + len -= this_len;

    if (skb->ip_summed == CHECKSUM_PARTIAL)
    /* local packet? */
    --
    git-series 0.9.1
    \
     
     \ /
      Last update: 2018-04-30 23:05    [W:3.586 / U:0.536 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site