Skip to content

Commit ee8b94c

Browse files
Ziyang Xuanmarckleinebudde
authored andcommitted
can: raw: fix receiver memory leak
Got kmemleak errors with the following ltp can_filter testcase: for ((i=1; i<=100; i++)) do ./can_filter & sleep 0.1 done ============================================================== [<00000000db4a4943>] can_rx_register+0x147/0x360 [can] [<00000000a289549d>] raw_setsockopt+0x5ef/0x853 [can_raw] [<000000006d3d9ebd>] __sys_setsockopt+0x173/0x2c0 [<00000000407dbfec>] __x64_sys_setsockopt+0x61/0x70 [<00000000fd468496>] do_syscall_64+0x33/0x40 [<00000000b7e47d51>] entry_SYSCALL_64_after_hwframe+0x61/0xc6 It's a bug in the concurrent scenario of unregister_netdevice_many() and raw_release() as following: cpu0 cpu1 unregister_netdevice_many(can_dev) unlist_netdevice(can_dev) // dev_get_by_index() return NULL after this net_set_todo(can_dev) raw_release(can_socket) dev = dev_get_by_index(, ro->ifindex); // dev == NULL if (dev) { // receivers in dev_rcv_lists not free because dev is NULL raw_disable_allfilters(, dev, ); dev_put(dev); } ... ro->bound = 0; ... call_netdevice_notifiers(NETDEV_UNREGISTER, ) raw_notify(, NETDEV_UNREGISTER, ) if (ro->bound) // invalid because ro->bound has been set 0 raw_disable_allfilters(, dev, ); // receivers in dev_rcv_lists will never be freed Add a net_device pointer member in struct raw_sock to record bound can_dev, and use rtnl_lock to serialize raw_socket members between raw_bind(), raw_release(), raw_setsockopt() and raw_notify(). Use ro->dev to decide whether to free receivers in dev_rcv_lists. Fixes: 8d0caed ("can: bcm/raw/isotp: use per module netdevice notifier") Reviewed-by: Oliver Hartkopp <[email protected]> Acked-by: Oliver Hartkopp <[email protected]> Signed-off-by: Ziyang Xuan <[email protected]> Link: https://lore.kernel.org/all/[email protected] Cc: [email protected] Signed-off-by: Marc Kleine-Budde <[email protected]>
1 parent 0dd1805 commit ee8b94c

File tree

1 file changed

+24
-33
lines changed

1 file changed

+24
-33
lines changed

net/can/raw.c

Lines changed: 24 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ struct raw_sock {
8484
struct sock sk;
8585
int bound;
8686
int ifindex;
87+
struct net_device *dev;
8788
struct list_head notifier;
8889
int loopback;
8990
int recv_own_msgs;
@@ -277,7 +278,7 @@ static void raw_notify(struct raw_sock *ro, unsigned long msg,
277278
if (!net_eq(dev_net(dev), sock_net(sk)))
278279
return;
279280

280-
if (ro->ifindex != dev->ifindex)
281+
if (ro->dev != dev)
281282
return;
282283

283284
switch (msg) {
@@ -292,6 +293,7 @@ static void raw_notify(struct raw_sock *ro, unsigned long msg,
292293

293294
ro->ifindex = 0;
294295
ro->bound = 0;
296+
ro->dev = NULL;
295297
ro->count = 0;
296298
release_sock(sk);
297299

@@ -337,6 +339,7 @@ static int raw_init(struct sock *sk)
337339

338340
ro->bound = 0;
339341
ro->ifindex = 0;
342+
ro->dev = NULL;
340343

341344
/* set default filter to single entry dfilter */
342345
ro->dfilter.can_id = 0;
@@ -385,28 +388,24 @@ static int raw_release(struct socket *sock)
385388

386389
lock_sock(sk);
387390

391+
rtnl_lock();
388392
/* remove current filters & unregister */
389393
if (ro->bound) {
390-
if (ro->ifindex) {
391-
struct net_device *dev;
392-
393-
dev = dev_get_by_index(sock_net(sk), ro->ifindex);
394-
if (dev) {
395-
raw_disable_allfilters(dev_net(dev), dev, sk);
396-
dev_put(dev);
397-
}
398-
} else {
394+
if (ro->dev)
395+
raw_disable_allfilters(dev_net(ro->dev), ro->dev, sk);
396+
else
399397
raw_disable_allfilters(sock_net(sk), NULL, sk);
400-
}
401398
}
402399

403400
if (ro->count > 1)
404401
kfree(ro->filter);
405402

406403
ro->ifindex = 0;
407404
ro->bound = 0;
405+
ro->dev = NULL;
408406
ro->count = 0;
409407
free_percpu(ro->uniq);
408+
rtnl_unlock();
410409

411410
sock_orphan(sk);
412411
sock->sk = NULL;
@@ -422,6 +421,7 @@ static int raw_bind(struct socket *sock, struct sockaddr *uaddr, int len)
422421
struct sockaddr_can *addr = (struct sockaddr_can *)uaddr;
423422
struct sock *sk = sock->sk;
424423
struct raw_sock *ro = raw_sk(sk);
424+
struct net_device *dev = NULL;
425425
int ifindex;
426426
int err = 0;
427427
int notify_enetdown = 0;
@@ -431,14 +431,13 @@ static int raw_bind(struct socket *sock, struct sockaddr *uaddr, int len)
431431
if (addr->can_family != AF_CAN)
432432
return -EINVAL;
433433

434+
rtnl_lock();
434435
lock_sock(sk);
435436

436437
if (ro->bound && addr->can_ifindex == ro->ifindex)
437438
goto out;
438439

439440
if (addr->can_ifindex) {
440-
struct net_device *dev;
441-
442441
dev = dev_get_by_index(sock_net(sk), addr->can_ifindex);
443442
if (!dev) {
444443
err = -ENODEV;
@@ -467,26 +466,20 @@ static int raw_bind(struct socket *sock, struct sockaddr *uaddr, int len)
467466
if (!err) {
468467
if (ro->bound) {
469468
/* unregister old filters */
470-
if (ro->ifindex) {
471-
struct net_device *dev;
472-
473-
dev = dev_get_by_index(sock_net(sk),
474-
ro->ifindex);
475-
if (dev) {
476-
raw_disable_allfilters(dev_net(dev),
477-
dev, sk);
478-
dev_put(dev);
479-
}
480-
} else {
469+
if (ro->dev)
470+
raw_disable_allfilters(dev_net(ro->dev),
471+
ro->dev, sk);
472+
else
481473
raw_disable_allfilters(sock_net(sk), NULL, sk);
482-
}
483474
}
484475
ro->ifindex = ifindex;
485476
ro->bound = 1;
477+
ro->dev = dev;
486478
}
487479

488480
out:
489481
release_sock(sk);
482+
rtnl_unlock();
490483

491484
if (notify_enetdown) {
492485
sk->sk_err = ENETDOWN;
@@ -553,9 +546,9 @@ static int raw_setsockopt(struct socket *sock, int level, int optname,
553546
rtnl_lock();
554547
lock_sock(sk);
555548

556-
if (ro->bound && ro->ifindex) {
557-
dev = dev_get_by_index(sock_net(sk), ro->ifindex);
558-
if (!dev) {
549+
dev = ro->dev;
550+
if (ro->bound && dev) {
551+
if (dev->reg_state != NETREG_REGISTERED) {
559552
if (count > 1)
560553
kfree(filter);
561554
err = -ENODEV;
@@ -596,7 +589,6 @@ static int raw_setsockopt(struct socket *sock, int level, int optname,
596589
ro->count = count;
597590

598591
out_fil:
599-
dev_put(dev);
600592
release_sock(sk);
601593
rtnl_unlock();
602594

@@ -614,9 +606,9 @@ static int raw_setsockopt(struct socket *sock, int level, int optname,
614606
rtnl_lock();
615607
lock_sock(sk);
616608

617-
if (ro->bound && ro->ifindex) {
618-
dev = dev_get_by_index(sock_net(sk), ro->ifindex);
619-
if (!dev) {
609+
dev = ro->dev;
610+
if (ro->bound && dev) {
611+
if (dev->reg_state != NETREG_REGISTERED) {
620612
err = -ENODEV;
621613
goto out_err;
622614
}
@@ -640,7 +632,6 @@ static int raw_setsockopt(struct socket *sock, int level, int optname,
640632
ro->err_mask = err_mask;
641633

642634
out_err:
643-
dev_put(dev);
644635
release_sock(sk);
645636
rtnl_unlock();
646637

0 commit comments

Comments
 (0)