lkml.org 
[lkml]   [2006]   [Mar]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: Fix hostap_cs double kfree
    On Wed, Mar 15, 2006 at 10:39:00AM +0800, Eugene Teo wrote:
    > prism2_config() kfree's twice if kmalloc fails.
    >
    > Coverity bug #930

    Thanks. I'm going through the issues related to Host AP driver in
    Coverity database and send a set of patches after some testing.

    > --- linux-2.6/drivers/net/wireless/hostap/hostap_cs.c~ 2006-03-15 10:05:36.000000000 +0800
    > +++ linux-2.6/drivers/net/wireless/hostap/hostap_cs.c 2006-03-15 10:24:53.000000000 +0800
    > @@ -585,8 +585,6 @@
    > parse = kmalloc(sizeof(cisparse_t), GFP_KERNEL);
    > hw_priv = kmalloc(sizeof(*hw_priv), GFP_KERNEL);
    > if (parse == NULL || hw_priv == NULL) {
    > - kfree(parse);
    > - kfree(hw_priv);
    > ret = -ENOMEM;
    > goto failed;
    > }

    This is a valid fix..

    > @@ -783,8 +781,10 @@
    > cs_error(link->handle, last_fn, last_ret);
    >
    > failed:
    > - kfree(parse);
    > - kfree(hw_priv);
    > + if (parse)
    > + kfree(parse);
    > + if (hw_priv)
    > + kfree(hw_priv);
    > prism2_release((u_long)link);
    > return ret;

    .. but this is not.

    --
    Jouni Malinen PGP id EFC895FA
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2006-03-15 04:20    [W:0.020 / U:95.440 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site