Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

macvlan: fix possible UAF in macvlan_forward_source()

Add RCU protection on (struct macvlan_source_entry)->vlan.

Whenever macvlan_hash_del_source() is called, we must clear
entry->vlan pointer before RCU grace period starts.

This allows macvlan_forward_source() to skip over
entries queued for freeing.

Note that macvlan_dev are already RCU protected, as they
are embedded in a standard netdev (netdev_priv(ndev)).

Fixes: 79cf79abce71 ("macvlan: add source mode")
Reported-by: syzbot+7182fbe91e58602ec1fe@syzkaller.appspotmail.com
https: //lore.kernel.org/netdev/695fb1e8.050a0220.1c677c.039f.GAE@google.com/T/#u
Signed-off-by: Eric Dumazet <edumazet@google.com>
Link: https://patch.msgid.link/20260108133651.1130486-1-edumazet@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

authored by

Eric Dumazet and committed by
Jakub Kicinski
7470a7a6 eb74c19f

+13 -7
+13 -7
drivers/net/macvlan.c
··· 59 59 60 60 struct macvlan_source_entry { 61 61 struct hlist_node hlist; 62 - struct macvlan_dev *vlan; 62 + struct macvlan_dev __rcu *vlan; 63 63 unsigned char addr[6+2] __aligned(sizeof(u16)); 64 64 struct rcu_head rcu; 65 65 }; ··· 146 146 147 147 hlist_for_each_entry_rcu(entry, h, hlist, lockdep_rtnl_is_held()) { 148 148 if (ether_addr_equal_64bits(entry->addr, addr) && 149 - entry->vlan == vlan) 149 + rcu_access_pointer(entry->vlan) == vlan) 150 150 return entry; 151 151 } 152 152 return NULL; ··· 168 168 return -ENOMEM; 169 169 170 170 ether_addr_copy(entry->addr, addr); 171 - entry->vlan = vlan; 171 + RCU_INIT_POINTER(entry->vlan, vlan); 172 172 h = &port->vlan_source_hash[macvlan_eth_hash(addr)]; 173 173 hlist_add_head_rcu(&entry->hlist, h); 174 174 vlan->macaddr_count++; ··· 187 187 188 188 static void macvlan_hash_del_source(struct macvlan_source_entry *entry) 189 189 { 190 + RCU_INIT_POINTER(entry->vlan, NULL); 190 191 hlist_del_rcu(&entry->hlist); 191 192 kfree_rcu(entry, rcu); 192 193 } ··· 391 390 int i; 392 391 393 392 hash_for_each_safe(port->vlan_source_hash, i, next, entry, hlist) 394 - if (entry->vlan == vlan) 393 + if (rcu_access_pointer(entry->vlan) == vlan) 395 394 macvlan_hash_del_source(entry); 396 395 397 396 vlan->macaddr_count = 0; ··· 434 433 435 434 hlist_for_each_entry_rcu(entry, h, hlist) { 436 435 if (ether_addr_equal_64bits(entry->addr, addr)) { 437 - if (entry->vlan->flags & MACVLAN_FLAG_NODST) 436 + struct macvlan_dev *vlan = rcu_dereference(entry->vlan); 437 + 438 + if (!vlan) 439 + continue; 440 + 441 + if (vlan->flags & MACVLAN_FLAG_NODST) 438 442 consume = true; 439 - macvlan_forward_source_one(skb, entry->vlan); 443 + macvlan_forward_source_one(skb, vlan); 440 444 } 441 445 } 442 446 ··· 1686 1680 struct macvlan_source_entry *entry; 1687 1681 1688 1682 hlist_for_each_entry_rcu(entry, h, hlist, lockdep_rtnl_is_held()) { 1689 - if (entry->vlan != vlan) 1683 + if (rcu_access_pointer(entry->vlan) != vlan) 1690 1684 continue; 1691 1685 if (nla_put(skb, IFLA_MACVLAN_MACADDR, ETH_ALEN, entry->addr)) 1692 1686 return 1;