CVS commit: pkgsrc/lang/ghc94

["Masatake Daimon" <pho%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   pho
Date:           Sat Jan 21 18:31:22 UTC 2023

Modified Files:
        pkgsrc/lang/ghc94: distinfo
        pkgsrc/lang/ghc94/patches: patch-rts_linker_MMap.c

Log Message:
Fix a possible segfault in RTS linker


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/lang/ghc94/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/ghc94/patches/patch-rts_linker_MMap.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/ghc94/distinfo
diff -u pkgsrc/lang/ghc94/distinfo:1.8 pkgsrc/lang/ghc94/distinfo:1.9
--- pkgsrc/lang/ghc94/distinfo:1.8      Sat Jan 21 18:24:42 2023
+++ pkgsrc/lang/ghc94/distinfo  Sat Jan 21 18:31:22 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2023/01/21 18:24:42 pho Exp $
+$NetBSD: distinfo,v 1.9 2023/01/21 18:31:22 pho Exp $
 
 BLAKE2s (ghc-9.0.1-boot-hadrian.tar.gz) = fff7259676e3d0281c7e15e684b65dc04313c9bcb4d6161962325c3fcee08c7b
 SHA512 (ghc-9.0.1-boot-hadrian.tar.gz) = 02047ca0718a240ce702aeac16c2194b6bf73119dacb59816c1e9a631667e420e44c6ef6d5b83f225af3bd31e3ec3fc8f28e9a3cb22e86f63089110429759878
@@ -59,7 +59,7 @@ SHA1 (patch-libraries_unix_System_Posix_
 SHA1 (patch-libraries_unix_System_Posix_Signals.hsc) = 49215dce493a6bbc440f91a3959e592f86fc779b
 SHA1 (patch-libraries_unix_include_execvpe.h) = 560c6e9b644687fad62e380f73f08359c48639a2
 SHA1 (patch-m4_fptools__set__haskell__platform__vars.m4) = 8c7a7ab965f4df8a68bedb35c32ee32c59ac2c94
-SHA1 (patch-rts_linker_MMap.c) = 9015bd4db6df0fa44e5d74d79d50c608fe306e98
+SHA1 (patch-rts_linker_MMap.c) = c2abd34b8d39bb8f508a54bf3db25f53e113e45b
 SHA1 (patch-rts_linker_MMap.h) = 8228fabcdaeb1511191da9fc614ff94d3eee8fbd
 SHA1 (patch-rts_rts.cabal.in) = 605e30da81e444046d00457fc3961025c2073615
 SHA1 (patch-utils_haddock_driver_Main.hs) = 26b015d3aef9fdff66e66c8e3d9a370a2dbd7067

Index: pkgsrc/lang/ghc94/patches/patch-rts_linker_MMap.c
diff -u pkgsrc/lang/ghc94/patches/patch-rts_linker_MMap.c:1.2 pkgsrc/lang/ghc94/patches/patch-rts_linker_MMap.c:1.3
--- pkgsrc/lang/ghc94/patches/patch-rts_linker_MMap.c:1.2       Sat Jan 21 16:02:11 2023
+++ pkgsrc/lang/ghc94/patches/patch-rts_linker_MMap.c   Sat Jan 21 18:31:22 2023
@@ -1,4 +1,4 @@
-$NetBSD: patch-rts_linker_MMap.c,v 1.2 2023/01/21 16:02:11 pho Exp $
+$NetBSD: patch-rts_linker_MMap.c,v 1.3 2023/01/21 18:31:22 pho Exp $
 
 Hunk #0-2, #6:
     NetBSD-specific way of switching pages from rw- to r-x. Even when the
@@ -25,7 +25,7 @@ Hunk #3-5:
     tech-kern thread:
     https://mail-index.netbsd.org/tech-kern/2022/02/17/msg027969.html
 
---- rts/linker/MMap.c.orig     2023-01-10 12:21:10.038457244 +0000
+--- rts/linker/MMap.c.orig     2022-12-23 16:19:02.000000000 +0000
 +++ rts/linker/MMap.c
 @@ -46,6 +46,8 @@ static const char *memoryAccessDescripti
    case MEM_NO_ACCESS:    return "no-access";
@@ -87,7 +87,7 @@ Hunk #3-5:
  static void *
  mmapInRegion (
          struct MemoryRegion *region,
-@@ -358,7 +390,11 @@ mmapForLinker (size_t bytes, MemoryAcces
+@@ -358,17 +390,27 @@ mmapForLinker (size_t bytes, MemoryAcces
      IF_DEBUG(linker_verbose, debugBelch("mmapForLinker: start\n"));
      if (RtsFlags.MiscFlags.linkerAlwaysPic) {
          /* make no attempt at mapping low memory if we are assuming PIC */
@@ -99,7 +99,10 @@ Hunk #3-5:
      } else {
          region = nearImage();
      }
-@@ -368,7 +404,13 @@ mmapForLinker (size_t bytes, MemoryAcces
+ 
+     /* Use MAP_32BIT if appropriate */
+-    if (region->end <= (void *) 0xffffffff) {
++    if (region && region->end <= (void *) 0xffffffff) {
          flags |= TRY_MAP_32BIT;
      }