net: qualcomm: rmnet: Fix incorrect receive packet handling during cleanup
Subsystems (3)
PATCH 1/1 net: qualcomm: rmnet: Fix incorrect receive packet handling during cleanup
During rmnet unregistration, the real device rx_handler is first cleared followed by the removal of rx_handler_data after the rcu synchronization.
Any packets in the receive path may observe that the rx_handler is NULL. However, there is no check when dereferencing this value to use the rmnet_port information.
This fixes following splat by adding the NULL check.
Unable to handle kernel NULL pointer dereference at virtual address 000000000000000d pc : rmnet_rx_handler+0x124/0x284 lr : rmnet_rx_handler+0x124/0x284 rmnet_rx_handler+0x124/0x284 __netif_receive_skb_core+0x758/0xd74 __netif_receive_skb+0x50/0x17c process_backlog+0x15c/0x1b8 napi_poll+0x88/0x284 net_rx_action+0xbc/0x23c __do_softirq+0x20c/0x48c
--- drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c +5 -0
@@ -188,6 +188,11 @@ rx_handler_result_t rmnet_rx_handler(struct sk_buff **pskb) dev = skb->dev; port =rmnet_get_port_rcu (dev); +if (unlikely (!port)) { +atomic_long_inc (&skb->dev->rx_nohandler); +kfree_skb (skb); + goto done; + }switch (port->rmnet_mode) {case RMNET_EPMODE_VND :
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
This patch was applied to netdev/net.git (refs/heads/master):
Hello:
This patch was applied to netdev/net.git (refs/heads/master):
Quoted 8 lines · On Fri, 13 Nov 2020 13:12:05 -0700 you wrote:
During rmnet unregistration, the real device
rx_handleris first cleared followed by the removal ofrx_handler_dataafter the rcu synchronization.Any packets in the receive path may observe that the
rx_handleris NULL. However, there is no check when dereferencing this value to use thermnet_portinformation.[...]
Here is the summary with links:
- [net] net: qualcomm: rmnet: Fix incorrect receive packet handling during cleanup
https://git.kernel.org/netdev/net/c/fc70f5bf5e52
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html