diff options
| author | stephen hemminger <stephen@networkplumber.org> | 2017-07-19 11:53:17 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-07-19 22:20:05 -0700 |
| commit | 2a926f791211b40ba114f45e0e7bfefd2fac5d30 (patch) | |
| tree | 3cd3b15122daed0f09c4cbb410d580e7f1a34b6b /drivers/net/hyperv/netvsc.c | |
| parent | 9749fed5d43d84b86f1c98b70167c31c296bb6a6 (diff) | |
| download | talos-op-linux-2a926f791211b40ba114f45e0e7bfefd2fac5d30.tar.gz talos-op-linux-2a926f791211b40ba114f45e0e7bfefd2fac5d30.zip | |
netvsc: need rcu_derefence when accessing internal device info
The netvsc_device structure should be accessed by rcu_dereference
in the send path. Change arguments to netvsc_send() to make
this easier to do correctly.
Remove no longer needed hv_device_to_netvsc_device.
Signed-off-by: Stephen Hemminger <sthemmin@microsoft.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/hyperv/netvsc.c')
| -rw-r--r-- | drivers/net/hyperv/netvsc.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c index 4a2550559442..3c6f3ae520d9 100644 --- a/drivers/net/hyperv/netvsc.c +++ b/drivers/net/hyperv/netvsc.c @@ -822,13 +822,15 @@ static inline void move_pkt_msd(struct hv_netvsc_packet **msd_send, msdp->count = 0; } -int netvsc_send(struct hv_device *device, +/* RCU already held by caller */ +int netvsc_send(struct net_device_context *ndev_ctx, struct hv_netvsc_packet *packet, struct rndis_message *rndis_msg, struct hv_page_buffer **pb, struct sk_buff *skb) { - struct netvsc_device *net_device = hv_device_to_netvsc_device(device); + struct netvsc_device *net_device = rcu_dereference(ndev_ctx->nvdev); + struct hv_device *device = ndev_ctx->device_ctx; int ret = 0; struct netvsc_channel *nvchan; u32 pktlen = packet->total_data_buflen, msd_len = 0; @@ -840,7 +842,7 @@ int netvsc_send(struct hv_device *device, bool xmit_more = (skb != NULL) ? skb->xmit_more : false; /* If device is rescinded, return error and packet will get dropped. */ - if (unlikely(net_device->destroy)) + if (unlikely(!net_device || net_device->destroy)) return -ENODEV; /* We may race with netvsc_connect_vsp()/netvsc_init_buf() and get |
