lkml.org 
[lkml]   [2017]   [Dec]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL for 3.18 33/40] igb: check memory allocation failure
    Date
    From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>

    [ Upstream commit 18eb86362a52f0af933cc0fd5e37027317eb2d1c ]

    Check memory allocation failures and return -ENOMEM in such cases, as
    already done for other memory allocations in this function.

    This avoids NULL pointers dereference.

    Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
    Tested-by: Aaron Brown <aaron.f.brown@intel.com
    Acked-by: PJ Waskiewicz <peter.waskiewicz.jr@intel.com>
    Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
    Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
    ---
    drivers/net/ethernet/intel/igb/igb_main.c | 2 ++
    1 file changed, 2 insertions(+)

    diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
    index 2ba73fc6d328..3b3911e511ac 100644
    --- a/drivers/net/ethernet/intel/igb/igb_main.c
    +++ b/drivers/net/ethernet/intel/igb/igb_main.c
    @@ -3001,6 +3001,8 @@ static int igb_sw_init(struct igb_adapter *adapter)
    /* Setup and initialize a copy of the hw vlan table array */
    adapter->shadow_vfta = kcalloc(E1000_VLAN_FILTER_TBL_SIZE, sizeof(u32),
    GFP_ATOMIC);
    + if (!adapter->shadow_vfta)
    + return -ENOMEM;

    /* This call may decrease the number of queues */
    if (igb_init_interrupt_scheme(adapter, true)) {
    --
    2.11.0
    \
     
     \ /
      Last update: 2017-12-13 03:05    [W:4.039 / U:1.576 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site