logo

bootstrap-initrd

Linux initrd to bootstrap from a small binary seed git clone https://anongit.hacktivis.me/git/bootstrap-initrd.git/

heirloom-no_alloca.patch (2672B)

    

  1. From c69bc8007b292b9040d398c5507c415427c7dff1 Mon Sep 17 00:00:00 2001
  2. From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
  3. Date: Sun, 2 Feb 2025 15:07:33 +0100
  4. Subject: [PATCH 1/2] tar/tar.c: remove usage of alloca()
  6. ---
  7.  tar/tar.c | 11 +++++++----
  8.  1 file changed, 7 insertions(+), 4 deletions(-)
  10. diff --git a/tar/tar.c b/tar/tar.c
  11. index 7985d93..2ad9fb2 100644
  12. --- a/tar/tar.c
  13. +++ b/tar/tar.c
  14. @@ -81,7 +81,6 @@ static const char sccsid[] USED = "@(#)tar.sl	1.177 (gritter) 4/14/07";
  15.  #include <inttypes.h>
  16.  #include <iblok.h>
  17.  #include <locale.h>
  18. -#include <alloca.h>
  19.  
  20.  #include <sys/ioctl.h>
  21.  
  22. @@ -2027,12 +2026,12 @@ bsrch(const char *s, int n, off_t l, off_t h)
  23.  	char *b;
  24.  	off_t m, m1;
  25.  
  26. -	b = alloca(N);
  27. +	b = malloc(N);
  28.  	njab = 0;
  29.  
  30.  loop:
  31.  	if(l >= h)
  32. -		return(-1L);
  33. +		goto fail;
  34.  	m = l + (h-l)/2 - N/2;
  35.  	if(m < l)
  36.  		m = l;
  37. @@ -2045,7 +2044,7 @@ bsrch(const char *s, int n, off_t l, off_t h)
  38.  		m++;
  39.  	}
  40.  	if(m >= h)
  41. -		return(-1L);
  42. +		goto fail;
  43.  	m1 = m;
  44.  	j = i;
  45.  	for(i++; i<N; i++) {
  46. @@ -2063,6 +2062,10 @@ bsrch(const char *s, int n, off_t l, off_t h)
  47.  		goto loop;
  48.  	}
  49.  	return(m);
  50. +
  51. +fail:
  52. +	free(b);
  53. +	return(-1L);
  54.  }
  55.  
  56.  static int
  57. -- 
  58. 2.45.3
  61. From 8b217e567deae47e92796580dc1684adc6a86efa Mon Sep 17 00:00:00 2001
  62. From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
  63. Date: Sun, 2 Feb 2025 15:09:07 +0100
  64. Subject: [PATCH 2/2] libcommon: get rid of custom getopt (due to alloca)
  66. musl getopt being good anyway
  67. ---
  68.  libcommon/Makefile.mk | 6 +-----
  69.  1 file changed, 1 insertion(+), 5 deletions(-)
  71. diff --git a/libcommon/Makefile.mk b/libcommon/Makefile.mk
  72. index 7ef8de1..c9764e6 100644
  73. --- a/libcommon/Makefile.mk
  74. +++ b/libcommon/Makefile.mk
  75. @@ -4,7 +4,7 @@ OBJ = asciitype.o ib_alloc.o ib_close.o ib_free.o ib_getlin.o ib_getw.o \
  76.  	ib_open.o ib_popen.o ib_read.o ib_seek.o oblok.o sfile.o strtol.o \
  77.  	getdir.o gmatch.o utmpx.o memalign.o pathconf.o \
  78.  	sigset.o signal.o sigrelse.o sighold.o sigignore.o sigpause.o \
  79. -	getopt.o pfmt.o vpfmt.o setlabel.o setuxlabel.o pfmt_label.o sysv3.o
  80. +	pfmt.o vpfmt.o setlabel.o setuxlabel.o pfmt_label.o sysv3.o
  81.  libcommon.a: headers $(OBJ)
  82.  	$(AR) -rv $@ $(OBJ)
  83.  	$(RANLIB) $@
  84. @@ -101,9 +101,6 @@ pathconf.o: pathconf.c
  85.  strtol.o: strtol.c
  86.  	$(CC) $(CFLAGSS) $(CPPFLAGS) $(LARGEF) $(IWCHAR) -I. -c strtol.c
  87.  
  88. -getopt.o: getopt.c
  89. -	$(CC) $(CFLAGSS) $(CPPFLAGS) $(LARGEF) $(IWCHAR) -I. -c getopt.c
  90. -
  91.  sysv3.o: sysv3.c
  92.  	$(CC) $(CFLAGSS) $(CPPFLAGS) $(LARGEF) $(IWCHAR) -I. -c sysv3.c
  93.  
  94. @@ -143,7 +140,6 @@ pfmt.o: pfmt.h
  95.  vpfmt.o: pfmt.h
  96.  setlabel.o: pfmt.h
  97.  setuxlabel.o: pfmt.h msgselect.h
  98. -getopt.o: msgselect.h
  99.  sighold.o: sigset.h
  100.  sigignore.o: sigset.h
  101.  sigpause.o: sigset.h
  102. -- 
  103. 2.45.3