hv_netvsc: Check status in SEND_RNDIS_PKT completion message
PATCH v3 1/1 hv_netvsc: Check status in SEND_RNDIS_PKT completion message
Completion responses to SEND_RNDIS_PKT messages are currently processed regardless of the status in the response, so that resources associated with the request are freed. While this is appropriate, code bugs that cause sending a malformed message, or errors on the Hyper-V host, go undetected. Fix this by checking the status and outputting a rate-limited message if there is an error.
---
Changes in v3:
* Fix rate-limit logic when msglen is too small [Haiyang Zhang]
Changes in v2:
* Add rate-limiting to error messages [Haiyang Zhang]
drivers/net/hyperv/netvsc.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
drivers/net/hyperv/netvsc.c +18 -0
@@ -813,6 +813,7 @@ static void netvsc_send_completion(struct net_device *ndev,u32 msglen =hv_pkt_datalen (desc);struct nvsp_message *pkt_rqst;u64 cmd_rqst; +u32 status;/* First check if this is a VMBUS completion without data payload */ if (!msglen) {
@@ -884,6 +885,23 @@ static void netvsc_send_completion(struct net_device *ndev,break ;case NVSP_MSG1_TYPE_SEND_RNDIS_PKT_COMPLETE : +if (msglen <sizeof (struct nvsp_message_header ) + +sizeof (struct nvsp_1_message_send_rndis_packet_complete )) { +if (net_ratelimit ()) +netdev_err (ndev,"nvsp_rndis_pkt_complete length too small: %u\n" , + msglen); +return ; + } + +/* If status indicates an error, output a message so we know +* there's a problem. But process the completion anyway so the +* resources are released. +*/ + status = nvsp_packet->msg.v1_msg.send_rndis_pkt_complete.status; +if (status !=NVSP_STAT_SUCCESS &&net_ratelimit ()) +netdev_err (ndev,"nvsp_rndis_pkt_complete error status: %x\n" , + status); +netvsc_send_tx_complete (ndev, net_device, incoming_channel, desc, budget);break ;
Signature · 1 line
1.8.3.1
Quoted 78 lines
-----Original Message-----
From: Michael Kelley (LINUX) <[email protected]>
Sent: Monday, February 13, 2023 12:08 AM
To: KY Srinivasan <[email protected]>; Haiyang Zhang <[email protected]>; [email protected]; Dexuan Cui <[email protected]>; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; linux- [email protected]; [email protected]
Cc: Michael Kelley (LINUX) <[email protected]>
Subject: [PATCH net-next v3 1/1]hv_netvsc: Check status inSEND_RNDIS_PKTcompletion messageCompletion responses to
SEND_RNDIS_PKTmessages are currently processed regardless of the status in the response, so that resources associated with the request are freed. While this is appropriate, code bugs that cause sending a malformed message, or errors on the Hyper-V host, go undetected. Fix this by checking the status and outputting a rate-limited message if there is an error.Signed-off-by Michael Kelley <[email protected]>---
Changes in v3:
* Fix rate-limit logic when msglen is too small [Haiyang Zhang]Changes in v2:
* Add rate-limiting to error messages [Haiyang Zhang]drivers/net/hyperv/netvsc.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)drivers/net/hyperv/netvsc.c +1
-0@@ -813,6 +813,7 @@ static void netvsc_send_completion(struct net_device *ndev, u32 msglen = hv_pkt_datalen(desc);struct nvsp_message *pkt_rqst;u64 cmd_rqst; +u32 status;/* First check if this is a VMBUS completion without data payload */ drivers/net/hyperv/netvsc.c +10
-0if (!msglen) {@@ -884,6 +885,23 @@ static void netvsc_send_completion(structnet_device *ndev, break;case NVSP_MSG1_TYPE_SEND_RNDIS_PKT_COMPLETE : +if (msglen <sizeof (struct nvsp_message_header ) + +sizeof (struct nvsp_1_message_send_rndis_packet_complete )) { +if (net_ratelimit ()) + netdev_err(ndev, "nvsp_rndis_pkt_complete length too small: %u\n", + msglen); +return ; + } + +/* If status indicates an error, output a message so we know +* there's a problem. But process the completion anyway so the
drivers/net/hyperv/netvsc.c +3
-0+* resources are released. +*/ + status = nvsp_packet-Quoted 1 line
msg.v1_msg.send_rndis_pkt_complete.status;
drivers/net/hyperv/netvsc.c +2
-0+if (status !=NVSP_STAT_SUCCESS &&net_ratelimit ()) + netdev_err(ndev, "nvsp_rndis_pkt_complete errorstatus: %x\n",
drivers/net/hyperv/netvsc.c +2
-0+ status); + netvsc_send_tx_complete(ndev, net_device,
incoming_channel,drivers/net/hyperv/netvsc.c +0
-1desc, budget);break ; --
Quoted 1 line
1.8.3.1
Thank you!
This patch was applied to netdev/net-next.git (master) by Paolo Abeni <[email protected]>:
Hello:
This patch was applied to netdev/net-next.git (master) by Paolo Abeni <[email protected]>:
Quoted 8 lines · On Sun, 12 Feb 2023 21:08:01 -0800 you wrote:
Completion responses to
SEND_RNDIS_PKTmessages are currently processed regardless of the status in the response, so that resources associated with the request are freed. While this is appropriate, code bugs that cause sending a malformed message, or errors on the Hyper-V host, go undetected. Fix this by checking the status and outputting a rate-limited message if there is an error.[...]
Here is the summary with links:
- [net-next,v3,1/1] hv_netvsc: Check status in SEND_RNDIS_PKT completion message
https://git.kernel.org/netdev/net-next/c/dca5161f9bd0
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html