aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHaiyang Zhang <haiyangz@microsoft.com>2016-03-23 12:43:09 -0400
committerDavid S. Miller <davem@davemloft.net>2016-03-23 14:38:55 -0400
commitd212b4633c3a99561939f2d423eacf3263850bcd (patch)
treed5bc5a90517956c625b52bfbf92fb16bc7b9fc3f
parent1f461dcdd296eecedaffffc6bae2bfa90bd7eb89 (diff)
hv_netvsc: Fix accessing freed memory in netvsc_change_mtu()
struct netvsc_device is freed in rndis_filter_device_remove(). So we save the nvdev->num_chn into a temp variable for later usage. (Please also include this patch into stable branch.) Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com> Reviewed-by: K. Y. Srinivasan <kys@microsoft.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/hyperv/netvsc_drv.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c
index 08608499fa17..b8121eba33ff 100644
--- a/drivers/net/hyperv/netvsc_drv.c
+++ b/drivers/net/hyperv/netvsc_drv.c
@@ -858,6 +858,7 @@ static int netvsc_change_mtu(struct net_device *ndev, int mtu)
858 struct netvsc_device *nvdev = hv_get_drvdata(hdev); 858 struct netvsc_device *nvdev = hv_get_drvdata(hdev);
859 struct netvsc_device_info device_info; 859 struct netvsc_device_info device_info;
860 int limit = ETH_DATA_LEN; 860 int limit = ETH_DATA_LEN;
861 u32 num_chn;
861 int ret = 0; 862 int ret = 0;
862 863
863 if (nvdev == NULL || nvdev->destroy) 864 if (nvdev == NULL || nvdev->destroy)
@@ -873,6 +874,8 @@ static int netvsc_change_mtu(struct net_device *ndev, int mtu)
873 if (ret) 874 if (ret)
874 goto out; 875 goto out;
875 876
877 num_chn = nvdev->num_chn;
878
876 nvdev->start_remove = true; 879 nvdev->start_remove = true;
877 rndis_filter_device_remove(hdev); 880 rndis_filter_device_remove(hdev);
878 881
@@ -883,7 +886,7 @@ static int netvsc_change_mtu(struct net_device *ndev, int mtu)
883 886
884 memset(&device_info, 0, sizeof(device_info)); 887 memset(&device_info, 0, sizeof(device_info));
885 device_info.ring_size = ring_size; 888 device_info.ring_size = ring_size;
886 device_info.num_chn = nvdev->num_chn; 889 device_info.num_chn = num_chn;
887 device_info.max_num_vrss_chns = max_num_vrss_chns; 890 device_info.max_num_vrss_chns = max_num_vrss_chns;
888 rndis_filter_device_add(hdev, &device_info); 891 rndis_filter_device_add(hdev, &device_info);
889 892