During the PV driver life cycle the mappings are added to the RB-tree by set_foreign_p2m_mapping(), which is called from gnttab_map_refs() and are removed by clear_foreign_p2m_mapping() which is called from gnttab_unmap_refs(). As both functions end up calling __set_phys_to_machine_multi() which updates the RB-tree, this function can be called concurrently. There is already a "p2m_lock" to protect against concurrent accesses, but the problem is that the first read of "phys_to_mach.rb_node" in __set_phys_to_machine_multi() is not covered by it, so this might lead to the incorrect mappings update (removing in our case) in RB-tree. In my environment the related issue happens rarely and only when PV net backend is running, the xen_add_phys_to_mach_entry() claims that it cannot add new pfn <-> mfn mapping to the tree since it is already exists which results in a failure when mapping foreign pages. But there might be other bad consequences related to the non-protected root reads such use-after-free, etc. While at it, also fix the similar usage in __pfn_to_mfn(), so initialize "struct rb_node *n" with the "p2m_lock" held in both functions to avoid possible bad consequences. This is CVE-2022-33744 / XSA-406.
Unified · Split
| @@ -63,11 +63,12 @@ out: · 62 unmodified lines | |||
| 63 | 63 | ||
| 64 | unsigned long __pfn_to_mfn(unsigned long pfn) | 64 | unsigned long __pfn_to_mfn(unsigned long pfn) |
| 65 | { | 65 | { |
| 66 | struct rb_node *n = phys_to_mach.rb_node; | 66 | struct rb_node *n; |
| 67 | struct xen_p2m_entry *entry; | 67 | struct xen_p2m_entry *entry; |
| 68 | unsigned long irqflags; | 68 | unsigned long irqflags; |
| 69 | 69 | ||
| 70 | read_lock_irqsave(&p2m_lock, irqflags); | 70 | read_lock_irqsave(&p2m_lock, irqflags); |
| 71 | n = phys_to_mach.rb_node; | ||
| 71 | while (n) { | 72 | while (n) { |
| 72 | entry = rb_entry(n, struct xen_p2m_entry, rbnode_phys); | 73 | entry = rb_entry(n, struct xen_p2m_entry, rbnode_phys); |
| 73 | if (entry->pfn <= pfn && | 74 | if (entry->pfn <= pfn && |
| @@ -152,10 +153,11 @@ bool __set_phys_to_machine_multi(unsigned long pfn, · 78 unmodified lines | |||
| 152 | int rc; | 153 | int rc; |
| 153 | unsigned long irqflags; | 154 | unsigned long irqflags; |
| 154 | struct xen_p2m_entry *p2m_entry; | 155 | struct xen_p2m_entry *p2m_entry; |
| 155 | struct rb_node *n = phys_to_mach.rb_node; | 156 | struct rb_node *n; |
| 156 | 157 | ||
| 157 | if (mfn == INVALID_P2M_ENTRY) { | 158 | if (mfn == INVALID_P2M_ENTRY) { |
| 158 | write_lock_irqsave(&p2m_lock, irqflags); | 159 | write_lock_irqsave(&p2m_lock, irqflags); |
| 160 | n = phys_to_mach.rb_node; | ||
| 159 | while (n) { | 161 | while (n) { |
| 160 | p2m_entry = rb_entry(n, struct xen_p2m_entry, rbnode_phys); | 162 | p2m_entry = rb_entry(n, struct xen_p2m_entry, rbnode_phys); |
| 161 | if (p2m_entry->pfn <= pfn && | 163 | if (p2m_entry->pfn <= pfn && |