lkml.org 
[lkml]   [2016]   [Jan]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.10 40/53] isdn_ppp: Add checks for allocation failure in isdn_ppp_open()
    Date
    3.10-stable review patch.  If anyone has any objections, please let me know.

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

    From: Ben Hutchings <ben@decadent.org.uk>

    [ Upstream commit 0baa57d8dc32db78369d8b5176ef56c5e2e18ab3 ]

    Compile-tested only.

    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/isdn/i4l/isdn_ppp.c | 6 ++++++
    1 file changed, 6 insertions(+)

    --- a/drivers/isdn/i4l/isdn_ppp.c
    +++ b/drivers/isdn/i4l/isdn_ppp.c
    @@ -301,6 +301,8 @@ isdn_ppp_open(int min, struct file *file
    is->compflags = 0;

    is->reset = isdn_ppp_ccp_reset_alloc(is);
    + if (!is->reset)
    + return -ENOMEM;

    is->lp = NULL;
    is->mp_seqno = 0; /* MP sequence number */
    @@ -320,6 +322,10 @@ isdn_ppp_open(int min, struct file *file
    * VJ header compression init
    */
    is->slcomp = slhc_init(16, 16); /* not necessary for 2. link in bundle */
    + if (!is->slcomp) {
    + isdn_ppp_ccp_reset_free(is);
    + return -ENOMEM;
    + }
    #endif
    #ifdef CONFIG_IPPP_FILTER
    is->pass_filter = NULL;

    \
     
     \ /
      Last update: 2016-01-27 21:21    [W:2.972 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site