lkml.org 
[lkml]   [2018]   [Aug]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 009/104] xen/netfront: dont cache skb_shinfo()
    Date
    4.14-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Juergen Gross <jgross@suse.com>

    commit d472b3a6cf63cd31cae1ed61930f07e6cd6671b5 upstream.

    skb_shinfo() can change when calling __pskb_pull_tail(): Don't cache
    its return value.

    Cc: stable@vger.kernel.org
    Signed-off-by: Juergen Gross <jgross@suse.com>
    Reviewed-by: Wei Liu <wei.liu2@citrix.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/net/xen-netfront.c | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    --- a/drivers/net/xen-netfront.c
    +++ b/drivers/net/xen-netfront.c
    @@ -894,7 +894,6 @@ static RING_IDX xennet_fill_frags(struct
    struct sk_buff *skb,
    struct sk_buff_head *list)
    {
    - struct skb_shared_info *shinfo = skb_shinfo(skb);
    RING_IDX cons = queue->rx.rsp_cons;
    struct sk_buff *nskb;

    @@ -903,15 +902,16 @@ static RING_IDX xennet_fill_frags(struct
    RING_GET_RESPONSE(&queue->rx, ++cons);
    skb_frag_t *nfrag = &skb_shinfo(nskb)->frags[0];

    - if (shinfo->nr_frags == MAX_SKB_FRAGS) {
    + if (skb_shinfo(skb)->nr_frags == MAX_SKB_FRAGS) {
    unsigned int pull_to = NETFRONT_SKB_CB(skb)->pull_to;

    BUG_ON(pull_to <= skb_headlen(skb));
    __pskb_pull_tail(skb, pull_to - skb_headlen(skb));
    }
    - BUG_ON(shinfo->nr_frags >= MAX_SKB_FRAGS);
    + BUG_ON(skb_shinfo(skb)->nr_frags >= MAX_SKB_FRAGS);

    - skb_add_rx_frag(skb, shinfo->nr_frags, skb_frag_page(nfrag),
    + skb_add_rx_frag(skb, skb_shinfo(skb)->nr_frags,
    + skb_frag_page(nfrag),
    rx->offset, rx->status, PAGE_SIZE);

    skb_shinfo(nskb)->nr_frags = 0;

    \
     
     \ /
      Last update: 2018-08-14 20:04    [W:4.489 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site