lkml.org 
[lkml]   [2019]   [Aug]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 018/223] af_key: fix leaks in key_pol_get_resp and dump_sp.
    Date
    [ Upstream commit 7c80eb1c7e2b8420477fbc998971d62a648035d9 ]

    In both functions, if pfkey_xfrm_policy2msg failed we leaked the newly
    allocated sk_buff. Free it on error.

    Fixes: 55569ce256ce ("Fix conversion between IPSEC_MODE_xxx and XFRM_MODE_xxx.")
    Reported-by: syzbot+4f0529365f7f2208d9f0@syzkaller.appspotmail.com
    Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
    Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    net/key/af_key.c | 8 ++++++--
    1 file changed, 6 insertions(+), 2 deletions(-)

    diff --git a/net/key/af_key.c b/net/key/af_key.c
    index 3ba903ff2bb0..36db179d848e 100644
    --- a/net/key/af_key.c
    +++ b/net/key/af_key.c
    @@ -2463,8 +2463,10 @@ static int key_pol_get_resp(struct sock *sk, struct xfrm_policy *xp, const struc
    goto out;
    }
    err = pfkey_xfrm_policy2msg(out_skb, xp, dir);
    - if (err < 0)
    + if (err < 0) {
    + kfree_skb(out_skb);
    goto out;
    + }

    out_hdr = (struct sadb_msg *) out_skb->data;
    out_hdr->sadb_msg_version = hdr->sadb_msg_version;
    @@ -2717,8 +2719,10 @@ static int dump_sp(struct xfrm_policy *xp, int dir, int count, void *ptr)
    return PTR_ERR(out_skb);

    err = pfkey_xfrm_policy2msg(out_skb, xp, dir);
    - if (err < 0)
    + if (err < 0) {
    + kfree_skb(out_skb);
    return err;
    + }

    out_hdr = (struct sadb_msg *) out_skb->data;
    out_hdr->sadb_msg_version = pfk->dump.msg_version;
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-08-02 12:09    [W:3.077 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site