* [PATCH RESEND 1/1] um: oops on accessing a non-present page in the vmalloc area @ 2024-02-23 14:04 Petr Tesarik 2024-03-12 15:07 ` Petr Tesarik 2024-03-21 4:44 ` David Gow 0 siblings, 2 replies; 9+ messages in thread From: Petr Tesarik @ 2024-02-23 14:04 UTC (permalink / raw) To: Richard Weinberger, Anton Ivanov, Johannes Berg, open list:USER-MODE LINUX (UML), open list Cc: Roberto Sassu, Petr Tesarik From: Petr Tesarik <petr.tesarik1@huawei-partners.com> If a segmentation fault is caused by accessing an address in the vmalloc area, check that the target page is present. Currently, if the kernel hits a guard page in the vmalloc area, UML blindly assumes that the fault is caused by a stale mapping and will be fixed by flush_tlb_kernel_vm(). Unsurprisingly, if the fault is caused by accessing a guard page, no mapping is created, and when the faulting instruction is restarted, it will cause exactly the same fault again, effectively creating an infinite loop. Signed-off-by: Petr Tesarik <petr.tesarik1@huawei-partners.com> --- arch/um/kernel/trap.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/um/kernel/trap.c b/arch/um/kernel/trap.c index 6d8ae86ae978..d5b85f1bfe33 100644 --- a/arch/um/kernel/trap.c +++ b/arch/um/kernel/trap.c @@ -206,11 +206,15 @@ unsigned long segv(struct faultinfo fi, unsigned long ip, int is_user, int err; int is_write = FAULT_WRITE(fi); unsigned long address = FAULT_ADDRESS(fi); + pte_t *pte; if (!is_user && regs) current->thread.segv_regs = container_of(regs, struct pt_regs, regs); if (!is_user && (address >= start_vm) && (address < end_vm)) { + pte = virt_to_pte(&init_mm, address); + if (!pte_present(*pte)) + page_fault_oops(regs, address, ip); flush_tlb_kernel_vm(); goto out; } -- 2.34.1 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH RESEND 1/1] um: oops on accessing a non-present page in the vmalloc area 2024-02-23 14:04 [PATCH RESEND 1/1] um: oops on accessing a non-present page in the vmalloc area Petr Tesarik @ 2024-03-12 15:07 ` Petr Tesarik 2024-03-18 13:09 ` Petr Tesarik 2024-03-21 4:44 ` David Gow 1 sibling, 1 reply; 9+ messages in thread From: Petr Tesarik @ 2024-03-12 15:07 UTC (permalink / raw) To: Richard Weinberger, Anton Ivanov, Johannes Berg, open list:USER-MODE LINUX (UML), open list Cc: Roberto Sassu, Petr Tesařík On 2/23/2024 3:04 PM, Petr Tesarik wrote: > From: Petr Tesarik <petr.tesarik1@huawei-partners.com> > > If a segmentation fault is caused by accessing an address in the vmalloc > area, check that the target page is present. > > Currently, if the kernel hits a guard page in the vmalloc area, UML blindly > assumes that the fault is caused by a stale mapping and will be fixed by > flush_tlb_kernel_vm(). Unsurprisingly, if the fault is caused by accessing > a guard page, no mapping is created, and when the faulting instruction is > restarted, it will cause exactly the same fault again, effectively creating > an infinite loop. Ping. Any comment on this fix? Petr T > > Signed-off-by: Petr Tesarik <petr.tesarik1@huawei-partners.com> > --- > arch/um/kernel/trap.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/arch/um/kernel/trap.c b/arch/um/kernel/trap.c > index 6d8ae86ae978..d5b85f1bfe33 100644 > --- a/arch/um/kernel/trap.c > +++ b/arch/um/kernel/trap.c > @@ -206,11 +206,15 @@ unsigned long segv(struct faultinfo fi, unsigned long ip, int is_user, > int err; > int is_write = FAULT_WRITE(fi); > unsigned long address = FAULT_ADDRESS(fi); > + pte_t *pte; > > if (!is_user && regs) > current->thread.segv_regs = container_of(regs, struct pt_regs, regs); > > if (!is_user && (address >= start_vm) && (address < end_vm)) { > + pte = virt_to_pte(&init_mm, address); > + if (!pte_present(*pte)) > + page_fault_oops(regs, address, ip); > flush_tlb_kernel_vm(); > goto out; > } ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH RESEND 1/1] um: oops on accessing a non-present page in the vmalloc area 2024-03-12 15:07 ` Petr Tesarik @ 2024-03-18 13:09 ` Petr Tesarik 2024-03-19 22:18 ` Richard Weinberger 0 siblings, 1 reply; 9+ messages in thread From: Petr Tesarik @ 2024-03-18 13:09 UTC (permalink / raw) To: Richard Weinberger, Anton Ivanov, Johannes Berg, open list:USER-MODE LINUX (UML), open list Cc: Roberto Sassu, Petr Tesařík On 3/12/2024 4:07 PM, Petr Tesarik wrote: > On 2/23/2024 3:04 PM, Petr Tesarik wrote: >> From: Petr Tesarik <petr.tesarik1@huawei-partners.com> >> >> If a segmentation fault is caused by accessing an address in the vmalloc >> area, check that the target page is present. >> >> Currently, if the kernel hits a guard page in the vmalloc area, UML blindly >> assumes that the fault is caused by a stale mapping and will be fixed by >> flush_tlb_kernel_vm(). Unsurprisingly, if the fault is caused by accessing >> a guard page, no mapping is created, and when the faulting instruction is >> restarted, it will cause exactly the same fault again, effectively creating >> an infinite loop. > > Ping. Any comment on this fix? I don't think I have seen a reply from you. If you did comment, then your email has not reached me. Please, can you confirm you have seen my patch? Kind regards Petr T > Petr T > >> >> Signed-off-by: Petr Tesarik <petr.tesarik1@huawei-partners.com> >> --- >> arch/um/kernel/trap.c | 4 ++++ >> 1 file changed, 4 insertions(+) >> >> diff --git a/arch/um/kernel/trap.c b/arch/um/kernel/trap.c >> index 6d8ae86ae978..d5b85f1bfe33 100644 >> --- a/arch/um/kernel/trap.c >> +++ b/arch/um/kernel/trap.c >> @@ -206,11 +206,15 @@ unsigned long segv(struct faultinfo fi, unsigned long ip, int is_user, >> int err; >> int is_write = FAULT_WRITE(fi); >> unsigned long address = FAULT_ADDRESS(fi); >> + pte_t *pte; >> >> if (!is_user && regs) >> current->thread.segv_regs = container_of(regs, struct pt_regs, regs); >> >> if (!is_user && (address >= start_vm) && (address < end_vm)) { >> + pte = virt_to_pte(&init_mm, address); >> + if (!pte_present(*pte)) >> + page_fault_oops(regs, address, ip); >> flush_tlb_kernel_vm(); >> goto out; >> } > ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH RESEND 1/1] um: oops on accessing a non-present page in the vmalloc area 2024-03-18 13:09 ` Petr Tesarik @ 2024-03-19 22:18 ` Richard Weinberger 2024-03-20 13:58 ` Petr Tesarik 0 siblings, 1 reply; 9+ messages in thread From: Richard Weinberger @ 2024-03-19 22:18 UTC (permalink / raw) To: Petr Tesarik Cc: anton ivanov, Johannes Berg, linux-um, linux-kernel, Roberto Sassu, petr ----- Ursprüngliche Mail ----- > Von: "Petr Tesarik" <petrtesarik@huaweicloud.com> > An: "richard" <richard@nod.at>, "anton ivanov" <anton.ivanov@cambridgegreys.com>, "Johannes Berg" > <johannes@sipsolutions.net>, "linux-um" <linux-um@lists.infradead.org>, "linux-kernel" <linux-kernel@vger.kernel.org> > CC: "Roberto Sassu" <roberto.sassu@huaweicloud.com>, "petr" <petr@tesarici.cz> > Gesendet: Montag, 18. März 2024 14:09:07 > Betreff: Re: [PATCH RESEND 1/1] um: oops on accessing a non-present page in the vmalloc area > On 3/12/2024 4:07 PM, Petr Tesarik wrote: >> On 2/23/2024 3:04 PM, Petr Tesarik wrote: >>> From: Petr Tesarik <petr.tesarik1@huawei-partners.com> >>> >>> If a segmentation fault is caused by accessing an address in the vmalloc >>> area, check that the target page is present. >>> >>> Currently, if the kernel hits a guard page in the vmalloc area, UML blindly >>> assumes that the fault is caused by a stale mapping and will be fixed by >>> flush_tlb_kernel_vm(). Unsurprisingly, if the fault is caused by accessing >>> a guard page, no mapping is created, and when the faulting instruction is >>> restarted, it will cause exactly the same fault again, effectively creating >>> an infinite loop. >> >> Ping. Any comment on this fix? > > I don't think I have seen a reply from you. If you did comment, then > your email has not reached me. > > Please, can you confirm you have seen my patch? Yes. I'm just way behind my maintainer schedule. :-/ Thanks, //richard ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH RESEND 1/1] um: oops on accessing a non-present page in the vmalloc area 2024-03-19 22:18 ` Richard Weinberger @ 2024-03-20 13:58 ` Petr Tesarik 2024-03-20 14:09 ` Richard Weinberger 0 siblings, 1 reply; 9+ messages in thread From: Petr Tesarik @ 2024-03-20 13:58 UTC (permalink / raw) To: Richard Weinberger Cc: anton ivanov, Johannes Berg, linux-um, linux-kernel, Roberto Sassu, petr On 3/19/2024 11:18 PM, Richard Weinberger wrote: > ----- Ursprüngliche Mail ----- >> Von: "Petr Tesarik" <petrtesarik@huaweicloud.com> >> An: "richard" <richard@nod.at>, "anton ivanov" <anton.ivanov@cambridgegreys.com>, "Johannes Berg" >> <johannes@sipsolutions.net>, "linux-um" <linux-um@lists.infradead.org>, "linux-kernel" <linux-kernel@vger.kernel.org> >> CC: "Roberto Sassu" <roberto.sassu@huaweicloud.com>, "petr" <petr@tesarici.cz> >> Gesendet: Montag, 18. März 2024 14:09:07 >> Betreff: Re: [PATCH RESEND 1/1] um: oops on accessing a non-present page in the vmalloc area > >> On 3/12/2024 4:07 PM, Petr Tesarik wrote: >>> On 2/23/2024 3:04 PM, Petr Tesarik wrote: >>>> From: Petr Tesarik <petr.tesarik1@huawei-partners.com> >>>> >>>> If a segmentation fault is caused by accessing an address in the vmalloc >>>> area, check that the target page is present. >>>> >>>> Currently, if the kernel hits a guard page in the vmalloc area, UML blindly >>>> assumes that the fault is caused by a stale mapping and will be fixed by >>>> flush_tlb_kernel_vm(). Unsurprisingly, if the fault is caused by accessing >>>> a guard page, no mapping is created, and when the faulting instruction is >>>> restarted, it will cause exactly the same fault again, effectively creating >>>> an infinite loop. >>> >>> Ping. Any comment on this fix? >> >> I don't think I have seen a reply from you. If you did comment, then >> your email has not reached me. >> >> Please, can you confirm you have seen my patch? > > Yes. I'm just way behind my maintainer schedule. :-/ Understood. Thank you for your reply. By the way, are you looking for more people to help with the amount of work? Petr T ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH RESEND 1/1] um: oops on accessing a non-present page in the vmalloc area 2024-03-20 13:58 ` Petr Tesarik @ 2024-03-20 14:09 ` Richard Weinberger 2024-03-20 15:14 ` Anton Ivanov 0 siblings, 1 reply; 9+ messages in thread From: Richard Weinberger @ 2024-03-20 14:09 UTC (permalink / raw) To: Petr Tesarik Cc: anton ivanov, Johannes Berg, linux-um, linux-kernel, Roberto Sassu, petr ----- Ursprüngliche Mail ----- > Von: "Petr Tesarik" <petrtesarik@huaweicloud.com> >> Yes. I'm just way behind my maintainer schedule. :-/ > > Understood. Thank you for your reply. > > By the way, are you looking for more people to help with the amount of work? Yes, help is always welcome! Johannes and Anton do already a great job but more maintenance power is always good. You could help with reviewing patches, testing stuff, etc. :-) It's not that UML itself is a lot of work, it's just that $dayjob is not UML related at all... Thanks, //richard ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH RESEND 1/1] um: oops on accessing a non-present page in the vmalloc area 2024-03-20 14:09 ` Richard Weinberger @ 2024-03-20 15:14 ` Anton Ivanov 0 siblings, 0 replies; 9+ messages in thread From: Anton Ivanov @ 2024-03-20 15:14 UTC (permalink / raw) To: Richard Weinberger, Petr Tesarik Cc: Johannes Berg, linux-um, linux-kernel, Roberto Sassu, petr On 20/03/2024 14:09, Richard Weinberger wrote: > ----- Ursprüngliche Mail ----- >> Von: "Petr Tesarik" <petrtesarik@huaweicloud.com> >>> Yes. I'm just way behind my maintainer schedule. :-/ >> >> Understood. Thank you for your reply. >> >> By the way, are you looking for more people to help with the amount of work? > > Yes, help is always welcome! > Johannes and Anton do already a great job but more maintenance power is always good. > You could help with reviewing patches, testing stuff, etc. :-) > It's not that UML itself is a lot of work, it's just that $dayjob is not UML related at all... Same here. > > Thanks, > //richard > > -- Anton R. Ivanov Cambridgegreys Limited. Registered in England. Company Number 10273661 https://www.cambridgegreys.com/ ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH RESEND 1/1] um: oops on accessing a non-present page in the vmalloc area 2024-02-23 14:04 [PATCH RESEND 1/1] um: oops on accessing a non-present page in the vmalloc area Petr Tesarik 2024-03-12 15:07 ` Petr Tesarik @ 2024-03-21 4:44 ` David Gow 2024-03-21 17:30 ` Petr Tesarik 1 sibling, 1 reply; 9+ messages in thread From: David Gow @ 2024-03-21 4:44 UTC (permalink / raw) To: Petr Tesarik Cc: Richard Weinberger, Anton Ivanov, Johannes Berg, open list:USER-MODE LINUX (UML), open list, Roberto Sassu, Petr Tesarik [-- Attachment #1: Type: text/plain, Size: 2267 bytes --] On Fri, 23 Feb 2024 at 22:07, Petr Tesarik <petrtesarik@huaweicloud.com> wrote: > > From: Petr Tesarik <petr.tesarik1@huawei-partners.com> > > If a segmentation fault is caused by accessing an address in the vmalloc > area, check that the target page is present. > > Currently, if the kernel hits a guard page in the vmalloc area, UML blindly > assumes that the fault is caused by a stale mapping and will be fixed by > flush_tlb_kernel_vm(). Unsurprisingly, if the fault is caused by accessing > a guard page, no mapping is created, and when the faulting instruction is > restarted, it will cause exactly the same fault again, effectively creating > an infinite loop. > > Signed-off-by: Petr Tesarik <petr.tesarik1@huawei-partners.com> > --- > arch/um/kernel/trap.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/arch/um/kernel/trap.c b/arch/um/kernel/trap.c > index 6d8ae86ae978..d5b85f1bfe33 100644 > --- a/arch/um/kernel/trap.c > +++ b/arch/um/kernel/trap.c > @@ -206,11 +206,15 @@ unsigned long segv(struct faultinfo fi, unsigned long ip, int is_user, > int err; > int is_write = FAULT_WRITE(fi); > unsigned long address = FAULT_ADDRESS(fi); > + pte_t *pte; > > if (!is_user && regs) > current->thread.segv_regs = container_of(regs, struct pt_regs, regs); > > if (!is_user && (address >= start_vm) && (address < end_vm)) { > + pte = virt_to_pte(&init_mm, address); > + if (!pte_present(*pte)) > + page_fault_oops(regs, address, ip); page_fault_oops() appears to be private to arch/x86/mm/fault.c, so can't be used here? Also, it accepts struct pt_regs*, not struct uml_pt_regs*, so would need to at least handle the type difference here. Could we equally avoid the infinite loop here by putting the 'flush_tlb_kernel_vm();goto out;' behind a if (pte_present(...)) check, and let the rest of the UML checks panic or oops if required. (Actually OOPSing where we can under UML would be nice to do at some point anyway, but is a bigger issue than just fixing a bug, IMO.) Or am I lacking a prerequisite patch or applying this to the wrong version (or otherwise missing something), as it definitely doesn't build here. Cheers, -- David [-- Attachment #2: S/MIME Cryptographic Signature --] [-- Type: application/pkcs7-signature, Size: 4014 bytes --] ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH RESEND 1/1] um: oops on accessing a non-present page in the vmalloc area 2024-03-21 4:44 ` David Gow @ 2024-03-21 17:30 ` Petr Tesarik 0 siblings, 0 replies; 9+ messages in thread From: Petr Tesarik @ 2024-03-21 17:30 UTC (permalink / raw) To: David Gow, Petr Tesarik Cc: Richard Weinberger, Anton Ivanov, Johannes Berg, open list:USER-MODE LINUX (UML), open list, Roberto Sassu On 3/21/2024 5:44 AM, David Gow wrote: > On Fri, 23 Feb 2024 at 22:07, Petr Tesarik <petrtesarik@huaweicloud.com> wrote: >> >> From: Petr Tesarik <petr.tesarik1@huawei-partners.com> >> >> If a segmentation fault is caused by accessing an address in the vmalloc >> area, check that the target page is present. >> >> Currently, if the kernel hits a guard page in the vmalloc area, UML blindly >> assumes that the fault is caused by a stale mapping and will be fixed by >> flush_tlb_kernel_vm(). Unsurprisingly, if the fault is caused by accessing >> a guard page, no mapping is created, and when the faulting instruction is >> restarted, it will cause exactly the same fault again, effectively creating >> an infinite loop. >> >> Signed-off-by: Petr Tesarik <petr.tesarik1@huawei-partners.com> >> --- >> arch/um/kernel/trap.c | 4 ++++ >> 1 file changed, 4 insertions(+) >> >> diff --git a/arch/um/kernel/trap.c b/arch/um/kernel/trap.c >> index 6d8ae86ae978..d5b85f1bfe33 100644 >> --- a/arch/um/kernel/trap.c >> +++ b/arch/um/kernel/trap.c >> @@ -206,11 +206,15 @@ unsigned long segv(struct faultinfo fi, unsigned long ip, int is_user, >> int err; >> int is_write = FAULT_WRITE(fi); >> unsigned long address = FAULT_ADDRESS(fi); >> + pte_t *pte; >> >> if (!is_user && regs) >> current->thread.segv_regs = container_of(regs, struct pt_regs, regs); >> >> if (!is_user && (address >= start_vm) && (address < end_vm)) { >> + pte = virt_to_pte(&init_mm, address); >> + if (!pte_present(*pte)) >> + page_fault_oops(regs, address, ip); > > page_fault_oops() appears to be private to arch/x86/mm/fault.c, so > can't be used here? > Also, it accepts struct pt_regs*, not struct uml_pt_regs*, so would > need to at least handle the type difference here. Argh, you're right. This was originally a two-patch series, but Richard wanted improvements in the implementation which would require more effort, see here: http://lists.infradead.org/pipermail/linux-um/2024-January/006406.html So I wanted to fix only the infinite loop, but in the mean time I forgot about the dependency on the first patch: http://lists.infradead.org/pipermail/linux-um/2023-December/006380.html That's because a quick git grep page_fault_oops found the function. It was my mistake that I did not notice the other page_fault_oops() earlier. OK, please forget about this patch for now; I must rework it. > Could we equally avoid the infinite loop here by putting the > 'flush_tlb_kernel_vm();goto out;' behind a if (pte_present(...)) > check, and let the rest of the UML checks panic or oops if required. > (Actually OOPSing where we can under UML would be nice to do at some > point anyway, but is a bigger issue than just fixing a bug, IMO.) Yes, that would be the best quick fix until I get to implementing all the blows and whistles (oops_* helpers, notification chains, tainting, etc.). Petr T > Or am I lacking a prerequisite patch or applying this to the wrong > version (or otherwise missing something), as it definitely doesn't > build here. > > Cheers, > -- David ^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2024-03-21 17:30 UTC | newest] Thread overview: 9+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2024-02-23 14:04 [PATCH RESEND 1/1] um: oops on accessing a non-present page in the vmalloc area Petr Tesarik 2024-03-12 15:07 ` Petr Tesarik 2024-03-18 13:09 ` Petr Tesarik 2024-03-19 22:18 ` Richard Weinberger 2024-03-20 13:58 ` Petr Tesarik 2024-03-20 14:09 ` Richard Weinberger 2024-03-20 15:14 ` Anton Ivanov 2024-03-21 4:44 ` David Gow 2024-03-21 17:30 ` Petr Tesarik
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox