Skip to content

Commit fc70f5b

Browse files
Subash Abhinov Kasiviswanathankuba-moo
authored andcommitted
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 Fixes: ceed73a ("drivers: net: ethernet: qualcomm: rmnet: Initial implementation") Signed-off-by: Sean Tranchetti <stranche@codeaurora.org> Signed-off-by: Subash Abhinov Kasiviswanathan <subashab@codeaurora.org> Link: https://lore.kernel.org/r/1605298325-3705-1-git-send-email-subashab@codeaurora.org Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent 9c79a8a commit fc70f5b

1 file changed

Lines changed: 5 additions & 0 deletions

File tree

drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,11 @@ rx_handler_result_t rmnet_rx_handler(struct sk_buff **pskb)
188188

189189
dev = skb->dev;
190190
port = rmnet_get_port_rcu(dev);
191+
if (unlikely(!port)) {
192+
atomic_long_inc(&skb->dev->rx_nohandler);
193+
kfree_skb(skb);
194+
goto done;
195+
}
191196

192197
switch (port->rmnet_mode) {
193198
case RMNET_EPMODE_VND:

0 commit comments

Comments
 (0)