Skip to content

Commit 8b17adf

Browse files
winmingregkh
authored andcommitted
net: qualcomm: rmnet: fix endpoint use-after-free in rmnet_dellink()
commit d00c953 upstream. rmnet_dellink() removes the endpoint from the hash table with hlist_del_init_rcu() and then immediately frees it with kfree(). However, RCU readers on the receive path (rmnet_rx_handler -> __rmnet_map_ingress_handler) may still hold a reference to the endpoint and dereference ep->egress_dev after the memory has been freed. The endpoint is a kmalloc-32 object, and the stale read at offset 8 corresponds to the egress_dev pointer. BUG: unable to handle page fault for address: ffffffffde942eef Oops: 0002 [#1] SMP NOPTI CPU: 1 UID: 0 PID: 137 Comm: poc_write Not tainted 7.0.0+ #4 PREEMPTLAZY RIP: 0010:rmnet_vnd_rx_fixup (rmnet_vnd.c:27) Call Trace: <TASK> __rmnet_map_ingress_handler (rmnet_handlers.c:48 rmnet_handlers.c:101) rmnet_rx_handler (rmnet_handlers.c:129 rmnet_handlers.c:235) __netif_receive_skb_core.constprop.0 (net/core/dev.c:6096) __netif_receive_skb_one_core (net/core/dev.c:6208) netif_receive_skb (net/core/dev.c:6467) tun_get_user (drivers/net/tun.c:1955) tun_chr_write_iter (drivers/net/tun.c:2003) vfs_write (fs/read_write.c:688) ksys_write (fs/read_write.c:740) </TASK> Add an rcu_head field to struct rmnet_endpoint and replace kfree() with kfree_rcu() so the endpoint memory remains valid through the RCU grace period. Also remove the rmnet_vnd_dellink() call and inline only the nr_rmnet_devs decrement, since rmnet_vnd_dellink() would set ep->egress_dev to NULL during the grace period, creating a data race with lockless readers. Fixes: ceed73a ("drivers: net: ethernet: qualcomm: rmnet: Initial implementation") Reported-by: Xiang Mei <xmei5@asu.edu> Signed-off-by: Weiming Shi <bestswngs@gmail.com> Link: https://patch.msgid.link/20260514122511.3083479-2-bestswngs@gmail.com Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 5f4d2bd commit 8b17adf

2 files changed

Lines changed: 5 additions & 4 deletions

File tree

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -213,8 +213,8 @@ static void rmnet_dellink(struct net_device *dev, struct list_head *head)
213213
ep = rmnet_get_endpoint(real_port, mux_id);
214214
if (ep) {
215215
hlist_del_init_rcu(&ep->hlnode);
216-
rmnet_vnd_dellink(mux_id, real_port, ep);
217-
kfree(ep);
216+
real_port->nr_rmnet_devs--;
217+
kfree_rcu(ep, rcu);
218218
}
219219

220220
netdev_upper_dev_unlink(real_dev, dev);
@@ -238,9 +238,9 @@ static void rmnet_force_unassociate_device(struct net_device *real_dev)
238238
hash_for_each_safe(port->muxed_ep, bkt_ep, tmp_ep, ep, hlnode) {
239239
unregister_netdevice_queue(ep->egress_dev, &list);
240240
netdev_upper_dev_unlink(real_dev, ep->egress_dev);
241-
rmnet_vnd_dellink(ep->mux_id, port, ep);
242241
hlist_del_init_rcu(&ep->hlnode);
243-
kfree(ep);
242+
port->nr_rmnet_devs--;
243+
kfree_rcu(ep, rcu);
244244
}
245245
rmnet_unregister_real_device(real_dev);
246246
unregister_netdevice_many(&list);

drivers/net/ethernet/qualcomm/rmnet/rmnet_config.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ struct rmnet_endpoint {
1818
u8 mux_id;
1919
struct net_device *egress_dev;
2020
struct hlist_node hlnode;
21+
struct rcu_head rcu;
2122
};
2223

2324
struct rmnet_egress_agg_params {

0 commit comments

Comments
 (0)