lkml.org 
[lkml]   [2018]   [Jan]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 41/87] cx82310_eth: use skb_cow_head() to deal with cloned skbs
    Date
    4.4-stable review patch.  If anyone has any objections, please let me know.

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

    From: Eric Dumazet <edumazet@google.com>

    commit a9e840a2081ed28c2b7caa6a9a0041c950b3c37d upstream.

    We need to ensure there is enough headroom to push extra header,
    but we also need to check if we are allowed to change headers.

    skb_cow_head() is the proper helper to deal with this.

    Fixes: cc28a20e77b2 ("introduce cx82310_eth: Conexant CX82310-based ADSL router USB ethernet driver")
    Signed-off-by: Eric Dumazet <edumazet@google.com>
    Cc: James Hughes <james.hughes@raspberrypi.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Oliver Neukum <oneukum@suse.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/net/usb/cx82310_eth.c | 7 ++-----
    1 file changed, 2 insertions(+), 5 deletions(-)

    --- a/drivers/net/usb/cx82310_eth.c
    +++ b/drivers/net/usb/cx82310_eth.c
    @@ -293,12 +293,9 @@ static struct sk_buff *cx82310_tx_fixup(
    {
    int len = skb->len;

    - if (skb_headroom(skb) < 2) {
    - struct sk_buff *skb2 = skb_copy_expand(skb, 2, 0, flags);
    + if (skb_cow_head(skb, 2)) {
    dev_kfree_skb_any(skb);
    - skb = skb2;
    - if (!skb)
    - return NULL;
    + return NULL;
    }
    skb_push(skb, 2);


    \
     
     \ /
      Last update: 2018-01-15 15:17    [W:4.097 / U:0.036 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site