lkml.org 
[lkml]   [2016]   [Feb]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.16.y-ckt 004/180] connector: bump skb->users before callback invocation
    Date
    3.16.7-ckt24 -stable review patch.  If anyone has any objections, please let me know.

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

    From: Florian Westphal <fw@strlen.de>

    commit 55285bf09427c5abf43ee1d54e892f352092b1f1 upstream.

    Dmitry reports memleak with syskaller program.
    Problem is that connector bumps skb usecount but might not invoke callback.

    So move skb_get to where we invoke the callback.

    Reported-by: Dmitry Vyukov <dvyukov@google.com>
    Signed-off-by: Florian Westphal <fw@strlen.de>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    drivers/connector/connector.c | 11 +++--------
    1 file changed, 3 insertions(+), 8 deletions(-)

    diff --git a/drivers/connector/connector.c b/drivers/connector/connector.c
    index f612d68629dc..fd7430e30cbc 100644
    --- a/drivers/connector/connector.c
    +++ b/drivers/connector/connector.c
    @@ -172,26 +172,21 @@ static int cn_call_callback(struct sk_buff *skb)
    *
    * It checks skb, netlink header and msg sizes, and calls callback helper.
    */
    -static void cn_rx_skb(struct sk_buff *__skb)
    +static void cn_rx_skb(struct sk_buff *skb)
    {
    struct nlmsghdr *nlh;
    - struct sk_buff *skb;
    int len, err;

    - skb = skb_get(__skb);
    -
    if (skb->len >= NLMSG_HDRLEN) {
    nlh = nlmsg_hdr(skb);
    len = nlmsg_len(nlh);

    if (len < (int)sizeof(struct cn_msg) ||
    skb->len < nlh->nlmsg_len ||
    - len > CONNECTOR_MAX_MSG_SIZE) {
    - kfree_skb(skb);
    + len > CONNECTOR_MAX_MSG_SIZE)
    return;
    - }

    - err = cn_call_callback(skb);
    + err = cn_call_callback(skb_get(skb));
    if (err < 0)
    kfree_skb(skb);
    }
    \
     
     \ /
      Last update: 2016-02-04 01:41    [W:3.796 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site