]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
rose: fix dangling neighbour pointers in rose_rt_device_down()
authorKohei Enju <enjuk@amazon.com>
Sun, 29 Jun 2025 03:06:31 +0000 (12:06 +0900)
committerJakub Kicinski <kuba@kernel.org>
Wed, 2 Jul 2025 02:28:48 +0000 (19:28 -0700)
There are two bugs in rose_rt_device_down() that can cause
use-after-free:

1. The loop bound `t->count` is modified within the loop, which can
   cause the loop to terminate early and miss some entries.

2. When removing an entry from the neighbour array, the subsequent entries
   are moved up to fill the gap, but the loop index `i` is still
   incremented, causing the next entry to be skipped.

For example, if a node has three neighbours (A, A, B) with count=3 and A
is being removed, the second A is not checked.

    i=0: (A, A, B) -> (A, B) with count=2
          ^ checked
    i=1: (A, B)    -> (A, B) with count=2
             ^ checked (B, not A!)
    i=2: (doesn't occur because i < count is false)

This leaves the second A in the array with count=2, but the rose_neigh
structure has been freed. Code that accesses these entries assumes that
the first `count` entries are valid pointers, causing a use-after-free
when it accesses the dangling pointer.

Fix both issues by iterating over the array in reverse order with a fixed
loop bound. This ensures that all entries are examined and that the removal
of an entry doesn't affect subsequent iterations.

Reported-by: syzbot+e04e2c007ba2c80476cb@syzkaller.appspotmail.com
Closes: https://syzkaller.appspot.com/bug?extid=e04e2c007ba2c80476cb
Tested-by: syzbot+e04e2c007ba2c80476cb@syzkaller.appspotmail.com
Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
Signed-off-by: Kohei Enju <enjuk@amazon.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Link: https://patch.msgid.link/20250629030833.6680-1-enjuk@amazon.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/rose/rose_route.c

index 2dd6bd3a3011f57ce12b1f828ea466ec2402c378..b72bf8a08d489fb56dad54d44a235b0a568542f2 100644 (file)
@@ -497,22 +497,15 @@ void rose_rt_device_down(struct net_device *dev)
                        t         = rose_node;
                        rose_node = rose_node->next;
 
-                       for (i = 0; i < t->count; i++) {
+                       for (i = t->count - 1; i >= 0; i--) {
                                if (t->neighbour[i] != s)
                                        continue;
 
                                t->count--;
 
-                               switch (i) {
-                               case 0:
-                                       t->neighbour[0] = t->neighbour[1];
-                                       fallthrough;
-                               case 1:
-                                       t->neighbour[1] = t->neighbour[2];
-                                       break;
-                               case 2:
-                                       break;
-                               }
+                               memmove(&t->neighbour[i], &t->neighbour[i + 1],
+                                       sizeof(t->neighbour[0]) *
+                                               (t->count - i));
                        }
 
                        if (t->count <= 0)