tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'uml-for-linux-6.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux
Pull uml fix from Johannes Berg:
"There's just a single fix here for the _nofault changes that were
causing issues with clang, and then when we looked at it some other
issues seemed to exist"
* tag 'uml-for-linux-6.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux:
um: fix _nofault accesses
+17
-15
+2
arch/um/include/asm/uaccess.h
+2
arch/um/include/asm/uaccess.h
···
55
55
goto err_label; \
56
56
} \
57
57
*((type *)dst) = get_unaligned((type *)(src)); \
58
+
barrier(); \
58
59
current->thread.segv_continue = NULL; \
59
60
} while (0)
60
61
···
67
66
if (__faulted) \
68
67
goto err_label; \
69
68
put_unaligned(*((type *)src), (type *)(dst)); \
69
+
barrier(); \
70
70
current->thread.segv_continue = NULL; \
71
71
} while (0)
72
72
+13
-13
arch/um/kernel/trap.c
+13
-13
arch/um/kernel/trap.c
···
225
225
panic("Failed to sync kernel TLBs: %d", err);
226
226
goto out;
227
227
}
228
-
else if (current->mm == NULL) {
229
-
if (current->pagefault_disabled) {
230
-
if (!mc) {
231
-
show_regs(container_of(regs, struct pt_regs, regs));
232
-
panic("Segfault with pagefaults disabled but no mcontext");
233
-
}
234
-
if (!current->thread.segv_continue) {
235
-
show_regs(container_of(regs, struct pt_regs, regs));
236
-
panic("Segfault without recovery target");
237
-
}
238
-
mc_set_rip(mc, current->thread.segv_continue);
239
-
current->thread.segv_continue = NULL;
240
-
goto out;
228
+
else if (current->pagefault_disabled) {
229
+
if (!mc) {
230
+
show_regs(container_of(regs, struct pt_regs, regs));
231
+
panic("Segfault with pagefaults disabled but no mcontext");
241
232
}
233
+
if (!current->thread.segv_continue) {
234
+
show_regs(container_of(regs, struct pt_regs, regs));
235
+
panic("Segfault without recovery target");
236
+
}
237
+
mc_set_rip(mc, current->thread.segv_continue);
238
+
current->thread.segv_continue = NULL;
239
+
goto out;
240
+
}
241
+
else if (current->mm == NULL) {
242
242
show_regs(container_of(regs, struct pt_regs, regs));
243
243
panic("Segfault with no mm");
244
244
}