lkml.org 
[lkml]   [2017]   [Sep]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.2 083/106] xfrm: Oops on error in pfkey_msg2xfrm_state()
    3.2.93-rc1 review patch.  If anyone has any objections, please let me know.

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

    From: Dan Carpenter <dan.carpenter@oracle.com>

    commit 1e3d0c2c70cd3edb5deed186c5f5c75f2b84a633 upstream.

    There are some missing error codes here so we accidentally return NULL
    instead of an error pointer. It results in a NULL pointer dereference.

    Fixes: df71837d5024 ("[LSM-IPSec]: Security association restriction.")
    Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
    Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    net/key/af_key.c | 16 ++++++++++++----
    1 file changed, 12 insertions(+), 4 deletions(-)

    --- a/net/key/af_key.c
    +++ b/net/key/af_key.c
    @@ -1163,8 +1163,10 @@ static struct xfrm_state * pfkey_msg2xfr
    if (key)
    keysize = (key->sadb_key_bits + 7) / 8;
    x->aalg = kmalloc(sizeof(*x->aalg) + keysize, GFP_KERNEL);
    - if (!x->aalg)
    + if (!x->aalg) {
    + err = -ENOMEM;
    goto out;
    + }
    strcpy(x->aalg->alg_name, a->name);
    x->aalg->alg_key_len = 0;
    if (key) {
    @@ -1183,8 +1185,10 @@ static struct xfrm_state * pfkey_msg2xfr
    goto out;
    }
    x->calg = kmalloc(sizeof(*x->calg), GFP_KERNEL);
    - if (!x->calg)
    + if (!x->calg) {
    + err = -ENOMEM;
    goto out;
    + }
    strcpy(x->calg->alg_name, a->name);
    x->props.calgo = sa->sadb_sa_encrypt;
    } else {
    @@ -1198,8 +1202,10 @@ static struct xfrm_state * pfkey_msg2xfr
    if (key)
    keysize = (key->sadb_key_bits + 7) / 8;
    x->ealg = kmalloc(sizeof(*x->ealg) + keysize, GFP_KERNEL);
    - if (!x->ealg)
    + if (!x->ealg) {
    + err = -ENOMEM;
    goto out;
    + }
    strcpy(x->ealg->alg_name, a->name);
    x->ealg->alg_key_len = 0;
    if (key) {
    @@ -1247,8 +1253,10 @@ static struct xfrm_state * pfkey_msg2xfr
    struct xfrm_encap_tmpl *natt;

    x->encap = kmalloc(sizeof(*x->encap), GFP_KERNEL);
    - if (!x->encap)
    + if (!x->encap) {
    + err = -ENOMEM;
    goto out;
    + }

    natt = x->encap;
    n_type = ext_hdrs[SADB_X_EXT_NAT_T_TYPE-1];
    \
     
     \ /
      Last update: 2017-09-10 00:52    [W:4.073 / U:0.096 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site