Subsystems (4)
This version addresses Sergei's comments.
o Fixed description and added Reported-by
o Removed NULL check for kfree()
PATCH 1/1 VMXNET3: Check for map error in vmxnet3_set_mc
We should check if the map of the table actually succeeds, and also free resources accordingly.
Version bumped to 1.2.1.0
Acked-by Shelley Gong <[email protected]>
Acked-by Bhavesh Davda <[email protected]>
Signed-off-by Andy King <[email protected]>
Reported-by Tetsuo Handa <[email protected]>
--- drivers/net/vmxnet3/vmxnet3_drv.c | 15 ++++++++------- drivers/net/vmxnet3/vmxnet3_int.h | 4 ++-- 2 files changed, 10 insertions(+), 9 deletions(-)
drivers/net/vmxnet3/vmxnet3_drv.c +8 -7
@@ -2056,7 +2056,6 @@ vmxnet3_set_mc(struct net_device *netdev)if (!netdev_mc_empty (netdev)) { new_table =vmxnet3_copy_mc (netdev);if (new_table) { - new_mode |=VMXNET3_RXM_MCAST ; rxConf->mfTableLen =cpu_to_le16 (netdev_mc_count (netdev) *ETH_ALEN ); new_table_pa = dma_map_single(
@@ -2064,15 +2063,18 @@ vmxnet3_set_mc(struct net_device *netdev) new_table, rxConf->mfTableLen, PCI_DMA_TODEVICE); + } + +if (new_table_pa) { + new_mode |=VMXNET3_RXM_MCAST ; rxConf->mfTablePA =cpu_to_le64 (new_table_pa); }else { -netdev_info (netdev,"failed to copy mcast list" -", setting ALL_MULTI\n" ); +netdev_info (netdev, +"failed to copy mcast list, setting ALL_MULTI\n" ); new_mode |=VMXNET3_RXM_ALL_MULTI ; } } -if (!(new_mode &VMXNET3_RXM_MCAST )) { rxConf->mfTableLen =0 ; rxConf->mfTablePA =0 ;
@@ -2091,11 +2093,10 @@ 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 ); -kfree (new_table); - } +kfree (new_table); }void
drivers/net/vmxnet3/vmxnet3_int.h +2 -2
@@ -69,10 +69,10 @@/* * Version numbers */ -#define VMXNET3_DRIVER_VERSION_STRING "1.2.0.0-k" +#define VMXNET3_DRIVER_VERSION_STRING "1.2.1.0-k"/* a 32-bit int, each byte encode a verion number in VMXNET3_DRIVER_VERSION */ -#define VMXNET3_DRIVER_VERSION_NUM 0x01020000 +#define VMXNET3_DRIVER_VERSION_NUM 0x01020100#if defined(CONFIG_PCI_MSI )/* RSS only makes sense if MSI-X is supported. */
Signature · 1 line
1.7.4.1
Re: [PATCH] VMXNET3: Check for map error in vmxnet3_set_mc
From: Andy King <[email protected]>
Date: Tue, 2 Sep 2014 13:13:44 -0700
Quoted 9 lines
We should check if the map of the table actually succeeds, and also free resources accordingly.
Version bumped to 1.2.1.0
Acked-by Shelley Gong <[email protected]>Acked-by Bhavesh Davda <[email protected]>Signed-off-by Andy King <[email protected]>Reported-by Tetsuo Handa <[email protected]>
Applied, thanks.