lkml.org 
[lkml]   [2016]   [Mar]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.19.y-ckt 177/196] pppoe: fix reference counting in PPPoE proxy
    Date
    3.19.8-ckt16 -stable review patch.  If anyone has any objections, please let me know.

    ---8<------------------------------------------------------------

    From: Guillaume Nault <g.nault@alphalink.fr>

    [ Upstream commit 29e73269aa4d36f92b35610c25f8b01c789b0dc8 ]

    Drop reference on the relay_po socket when __pppoe_xmit() succeeds.
    This is already handled correctly in the error path.

    Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    drivers/net/ppp/pppoe.c | 2 ++
    1 file changed, 2 insertions(+)

    diff --git a/drivers/net/ppp/pppoe.c b/drivers/net/ppp/pppoe.c
    index 2745949..3ede84e 100644
    --- a/drivers/net/ppp/pppoe.c
    +++ b/drivers/net/ppp/pppoe.c
    @@ -392,6 +392,8 @@ static int pppoe_rcv_core(struct sock *sk, struct sk_buff *skb)

    if (!__pppoe_xmit(sk_pppox(relay_po), skb))
    goto abort_put;
    +
    + sock_put(sk_pppox(relay_po));
    } else {
    if (sock_queue_rcv_skb(sk, skb))
    goto abort_kfree;
    --
    2.7.0
    \
     
     \ /
      Last update: 2016-03-09 02:21    [W:3.553 / U:0.060 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site