git: ddfa5b011ca6 - stable/13 - linux: Update the i386/linux vdso deinitialization routine

Mark Johnston markj at FreeBSD.org
Tue Feb 23 01:30:44 UTC 2021


The branch stable/13 has been updated by markj:

URL: https://cgit.FreeBSD.org/src/commit/?id=ddfa5b011ca665711fa11926715614c993ee110d

commit ddfa5b011ca665711fa11926715614c993ee110d
Author:     Mark Johnston <markj at FreeBSD.org>
AuthorDate: 2021-02-16 22:06:20 +0000
Commit:     Mark Johnston <markj at FreeBSD.org>
CommitDate: 2021-02-23 01:30:01 +0000

    linux: Update the i386/linux vdso deinitialization routine
    
    This was missed in commit 0fc8a796722 ("linux: Unmap the VDSO page when
    unloading").
    
    Reported by:    Mark Millard
    MFC with:       0fc8a796722
    
    (cherry picked from commit aa5fef60bf663d31cddf53d7a8c6856d5e4672c0)
---
 sys/i386/linux/linux_sysvec.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sys/i386/linux/linux_sysvec.c b/sys/i386/linux/linux_sysvec.c
index 10229d8af57e..ef845675aaa4 100644
--- a/sys/i386/linux/linux_sysvec.c
+++ b/sys/i386/linux/linux_sysvec.c
@@ -938,7 +938,8 @@ static void
 linux_vdso_deinstall(void *param)
 {
 
-	__elfN(linux_shared_page_fini)(linux_shared_page_obj);
+	__elfN(linux_shared_page_fini)(linux_shared_page_obj,
+	    linux_shared_page_mapping);
 }
 SYSUNINIT(elf_linux_vdso_uninit, SI_SUB_EXEC, SI_ORDER_FIRST,
     linux_vdso_deinstall, NULL);


More information about the dev-commits-src-all mailing list