X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=regress%2Fhfuzzraw.c.m4;h=0ed71a2c326232cba12bb4e72fdac6b58ea575ec;hb=a469269abe5aefc86ca0ef6344eb1359985759f5;hp=faab75947a0010e38299e52925708e562147a428;hpb=fef04606834147042b18488ddde341bdaf87b602;p=adns.git

diff --git a/regress/hfuzzraw.c.m4 b/regress/hfuzzraw.c.m4
index faab759..0ed71a2 100644
--- a/regress/hfuzzraw.c.m4
+++ b/regress/hfuzzraw.c.m4
@@ -46,36 +46,14 @@ static vbuf fdtab;
 #define FDF_OPEN     001u
 #define FDF_NONBLOCK 002u
 
-static FILE *Tinputfile;
-static int stdout_enable;
+static FILE *Tinputfile, *traceout;
+static int traceprint;
 
-static void Tflushstdout( void) {
-  if (fflush(stdout)) Toutputerr();
+static void Tflushtrace( void) {
+  if (fflush(traceout)) Toutputerr();
 }
 
-void Q_vb(void) {
-  if (!adns__vbuf_append(&vb,"",1)) Tnomem();
-  if (fprintf(stdout," %s\n",vb.buf) == EOF) Toutputerr();
-  Tflushstdout();
-}
-
-static void Pformat(const char *what) {
-  fprintf(stderr,"adns test harness: format error in raw log input file: %s\n",what);
-  exit(-1);
-}
-
-extern void Tshutdown(void) {
-  int c= fgetc(Tinputfile);
-  if (c!=EOF) Pformat("unwanted additional syscall reply data");
-  if (ferror(Tinputfile)) Tfailed("read test log input (at end)");
-}
-
-static void Pcheckinput(void) {
-  if (ferror(Tinputfile)) Tfailed("read test log input file");
-  if (feof(Tinputfile)) Pformat("eof at syscall reply");
-}
-
-void Tensurerecordfile(void) {
+void Tensuresetup(void) {
   static int done;
 
   if (done) return;
@@ -93,32 +71,58 @@ void Tensurerecordfile(void) {
     if (!adns__vbuf_append(&fdtab,&fdfstd,1)) Tnomem();
   }
 
-  const char *proutstr= getenv("ADNS_TEST_FUZZRAW_STDOUT_ENABLE");
-  if (proutstr) stdout_enable= atoi(proutstr);
+  const char *traceprintstr= getenv("ADNS_TEST_FUZZRAW_TRACEPRINT");
+  if (traceprintstr) {
+    traceprint= atoi(traceprintstr);
+    traceout= fdopen(2,"w");  if (!traceout) Tfailed("fdopen for traceout");
+  }
+}
+
+void Q_vb(void) {
+  if (!traceprint) return; /* hcommon.c.m4 can call Q_vb directly */
+  if (!adns__vbuf_append(&vb,"",1)) Tnomem();
+  if (fprintf(traceout," %s\n",vb.buf) == EOF) Toutputerr();
+  Tflushtrace();
+}
+
+static void Pformat(const char *what) {
+  fprintf(stderr,"adns test harness: format error in raw log input file: %s\n",what);
+  exit(-1);
+}
+
+extern void Tshutdown(void) {
+  int c= fgetc(Tinputfile);
+  if (c!=EOF) Pformat("unwanted additional syscall reply data");
+  if (ferror(Tinputfile)) Tfailed("read test log input (at end)");
 }
 
+static void Pcheckinput(void) {
+  if (ferror(Tinputfile)) Tfailed("read test log input file");
+  if (feof(Tinputfile)) Pformat("eof at syscall reply");
+}
 
 static void P_read_dump(const unsigned char *p0, size_t count, ssize_t d) {
-  fputs(" | ",stdout);
+  fputs(" | ",traceout);
   while (count) {
-    fprintf(stdout,"%02x", *p0);
+    fprintf(traceout,"%02x", *p0);
     p0 += d;
     count--;
   }
 }
     
 static void P_read(void *p, size_t sz, const char *what) {
+  long pos = ftell(Tinputfile);
   ssize_t got = fread(p,1,sz,Tinputfile);
   Pcheckinput();
   assert(got==sz);
-  if (stdout_enable && sz) {
-    fprintf(stdout,"%s:",what);
+  if (traceprint>1 && sz) {
+    fprintf(traceout,"%8lx %8s:",pos,what);
     P_read_dump(p, sz, +1);
     if (sz<=16) {
       P_read_dump((const unsigned char *)p+sz-1, sz, -1);
     }
-    fputs(" |\n",stdout);
-    Tflushstdout();
+    fputs(" |\n",traceout);
+    Tflushtrace();
   }
 }
 
@@ -137,27 +141,28 @@ void T_gettimeofday_hook(void) {
 }
 
 static void Paddr(struct sockaddr *addr, int *lenr) {
-  int l, r;
+  int al, r;
   uint16_t port;
   char buf[512];
   socklen_t sl = *lenr;
 
-  P_READ(l);
-  if (l<0 || l>=sizeof(buf)-1) Pformat("bad addr len");
-  buf[l]= 0;
+  P_READ(al);
+  if (al<0 || al>=sizeof(buf)-1) Pformat("bad addr len");
+  P_read(buf,al,"addrtext");
+  buf[al]= 0;
   P_READ(port);
   r= adns_text2addr(buf,port, adns_qf_addrlit_scope_numeric, addr, &sl);
   if (r==EINVAL) Pformat("bad addr text");
-  assert(r==ENOSPC);
+  assert(r==0 || r==ENOSPC);
   *lenr = sl;
 }
 
 static int Pbytes(byte *buf, int maxlen) {
-  int l;
-  P_READ(l);
-  if (l<0 || l>maxlen) Pformat("bad byte block len");
-  P_read(buf, l, "bytes");
-  return l;
+  int bl;
+  P_READ(bl);
+  if (bl<0 || bl>maxlen) Pformat("bad byte block len");
+  P_read(buf, bl, "bytes");
+  return bl;
 }
 
 static void Pfdset(fd_set *set, int max, int *r_io) {
@@ -188,6 +193,20 @@ static void Pfdset(fd_set *set, int max, int *r_io) {
   }
 }
 
+#ifdef FUZZRAW_SYNC
+static void Psync(const char *exp, char *got, size_t sz, const char *what) {
+  P_read(got,sz,"syscall");
+  if (memcmp(exp,got,sz)) Pformat(what);
+}
+#endif
+m4_define(`syscall_sync',`
+#ifdef FUZZRAW_SYNC
+  hm_fr_syscall_ident($'`1)
+  static char sync_got[sizeof(sync_expect)];
+  Psync(sync_expect, sync_got, sizeof(sync_got), "sync lost: program did $1");
+#endif
+')
+
 #ifdef HAVE_POLL
 static void Ppollfds(struct pollfd *fds, int nfds, int *r_io) {
   int fd;
@@ -202,15 +221,12 @@ static void Ppollfds(struct pollfd *fds, int nfds, int *r_io) {
 #endif
 
 static int P_succfail(void) {
-  int r;
-  P_READ(r);
-  if (r<0 && -r<Tnerrnos) {
-    errno= Terrnos[-r].v;
+  int e;
+  P_READ(e);
+  if (e>0) {
+    errno= e;
     return -1;
-  } else if (r>0 && r<=255) {
-    errno= r;
-    return -1;
-  } else if (r) {
+  } else if (e) {
     Pformat("wrong errno value");
   }
   return 0;
@@ -229,13 +245,15 @@ int H$1(hm_args_massage($3,void)) {
  hm_create_hqcall_init($1)
  $3
 
- Tensurerecordfile();
+ Tensuresetup();
 
- if (stdout_enable) {
+ if (traceprint) {
    hm_create_hqcall_args
    Q$1(hm_args_massage($3));
  }
 
+  syscall_sync($'`1)
+
  m4_define(`hm_rv_succfail',`
   r= P_succfail();
   if (r<0) return r;
@@ -249,8 +267,7 @@ int H$1(hm_args_massage($3,void)) {
   }
  ')
  m4_define(`hm_rv_len',`
-  hm_rv_any
-  if (r>($'`1)) Pformat("syscall length return is excessive");
+  hm_rv_succfail
  ')
  m4_define(`hm_rv_must',`
   r= 0;
@@ -316,6 +333,7 @@ m4_define(`hm_specsyscall', `')
 m4_include(`hsyscalls.i4')
 
 int Hclose(int fd) {
+  syscall_sync(close)
   P_fdf(fd);
   fdtab.buf[fd]= 0;
   return P_succfail();