lkml.org 
[lkml]   [2014]   [Sep]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] VMXNET3: Check for map error in vmxnet3_set_mc
Hello.

On 09/02/2014 08:30 PM, Andy King wrote:

> We should check if the map of the table actually succeeds, and also free
> resources accordingly. This fixes the kernel panic reported by Tetsuo
> Handa.

There's "Reported-by:" line for that.

> Version bumped to 1.2.1.0

> Acked-by: Shelley Gong <shelleygong@vmware.com>
> Acked-by: Bhavesh Davda <bhavesh@vmware.com>
> Signed-off-by: Andy King <acking@vmware.com>
> ---
> drivers/net/vmxnet3/vmxnet3_drv.c | 14 ++++++++------
> drivers/net/vmxnet3/vmxnet3_int.h | 4 ++--
> 2 files changed, 10 insertions(+), 8 deletions(-)

> diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c
> index d6e90c7..f450010 100644
> --- a/drivers/net/vmxnet3/vmxnet3_drv.c
> +++ b/drivers/net/vmxnet3/vmxnet3_drv.c
[...]
> @@ -2091,11 +2093,11 @@ vmxnet3_set_mc(struct net_device *netdev)
> VMXNET3_CMD_UPDATE_MAC_FILTERS);
> spin_unlock_irqrestore(&adapter->cmd_lock, flags);
>
> - if (new_table) {
> + if (new_table_pa)
> dma_unmap_single(&adapter->pdev->dev, new_table_pa,
> rxConf->mfTableLen, PCI_DMA_TODEVICE);
> + if (new_table)
> kfree(new_table);

The above *if* is not needed -- kfree() already checks for NULL.

[...]

WBR, Sergei



\
 
 \ /
  Last update: 2014-09-02 22:41    [W:0.052 / U:0.168 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site