Hello community, here is the log from the commit of package trinity for openSUSE:Factory checked in at 2017-08-30 16:22:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/trinity (Old) and /work/SRC/openSUSE:Factory/.trinity.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "trinity" Wed Aug 30 16:22:27 2017 rev:43 rq:519315 version:1.7+git.20170825 Changes: -------- --- /work/SRC/openSUSE:Factory/trinity/trinity.changes 2017-08-16 16:15:23.407264461 +0200 +++ /work/SRC/openSUSE:Factory/.trinity.new/trinity.changes 2017-08-30 16:23:33.662469525 +0200 @@ -1,0 +2,18 @@ +Tue Aug 29 11:15:31 UTC 2017 - mpluskal@suse.com + +- Update to version 1.7+git.20170825: + * add RENAME_WHITEOUT + * econet: make optional + * ax25: make optional + * change include <sys/termios.h> -> <termios.h> + * ipx: make optional + * replace __WORDSIZE with WORD_BIT + * types.h: change __uint32_t -> uint32_t + * syscalls/select: ensure __NFDBITS is defined + * fix includes + * pathnames: add missing nftw defines + * Fix version.h generation + * syscall: ensure a child is not killed with a lock held + * Add SIGILL as a potential child exit signal + +------------------------------------------------------------------- Old: ---- trinity-1.7+git.20170813.tar.xz New: ---- trinity-1.7+git.20170825.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ trinity.spec ++++++ --- /var/tmp/diff_new_pack.MFkDmd/_old 2017-08-30 16:23:34.822306375 +0200 +++ /var/tmp/diff_new_pack.MFkDmd/_new 2017-08-30 16:23:34.826305812 +0200 @@ -16,9 +16,9 @@ # -%define version_unconverted 1.7+git.20170813 +%define version_unconverted 1.7+git.20170825 Name: trinity -Version: 1.7+git.20170813 +Version: 1.7+git.20170825 Release: 0 Summary: A Linux System call fuzz tester License: GPL-2.0 ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.MFkDmd/_old 2017-08-30 16:23:34.882297936 +0200 +++ /var/tmp/diff_new_pack.MFkDmd/_new 2017-08-30 16:23:34.882297936 +0200 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">git://github.com/kernelslacker/trinity</param> - <param name="changesrevision">2ce77d8b298b883836867414fc5d71bf0ae0f548</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">c988a3c1d4c7d065b0e3345d050370d86f3d6831</param></service></servicedata> \ No newline at end of file ++++++ trinity-1.7+git.20170813.tar.xz -> trinity-1.7+git.20170825.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/trinity-1.7+git.20170813/Makefile new/trinity-1.7+git.20170825/Makefile --- old/trinity-1.7+git.20170813/Makefile 2017-08-13 23:55:08.000000000 +0200 +++ new/trinity-1.7+git.20170825/Makefile 2017-08-25 17:32:31.000000000 +0200 @@ -72,9 +72,6 @@ all: trinity -version: - @scripts/gen-versionh.sh - test: @if [ ! -f config.h ]; then echo "Run configure.sh first." ; exit; fi @@ -92,6 +89,8 @@ syscalls/x86/i386/*.c;; \ esac) +VERSION_H := include/version.h + HEADERS := $(patsubst %.h,%.h,$(wildcard *.h)) $(patsubst %.h,%.h,$(wildcard syscalls/*.h)) $(patsubst %.h,%.h,$(wildcard ioctls/*.h)) SRCS := $(wildcard *.c) \ @@ -118,13 +117,16 @@ -include $(SRCS:%.c=$(DEPDIR)/%.d) -trinity: version test $(OBJS) $(HEADERS) +$(VERSION_H): scripts/gen-versionh.sh Makefile $(wildcard .git) + @scripts/gen-versionh.sh + +trinity: test $(OBJS) $(HEADERS) $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o trinity $(OBJS) $(LDLIBS) @mkdir -p tmp df = $(DEPDIR)/$(*D)/$(*F) -%.o : %.c +%.o : %.c | $(VERSION_H) $(QUIET_CC)$(CC) $(CFLAGS) -o $@ -c $< @mkdir -p $(DEPDIR)/$(*D) @$(CC) -MM $(CFLAGS) $*.c > $(df).d @@ -141,7 +143,7 @@ @rm -f tags @rm -rf $(DEPDIR)/* @rm -rf trinity-coverity.tar.xz cov-int - @rm -f include/version.h + @rm -f $(VERSION_H) tag: @git tag -a v$(VERSION) -m "$(VERSION) release." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/trinity-1.7+git.20170813/configure new/trinity-1.7+git.20170825/configure --- old/trinity-1.7+git.20170813/configure 2017-08-13 23:55:08.000000000 +0200 +++ new/trinity-1.7+git.20170825/configure 2017-08-25 17:32:31.000000000 +0200 @@ -305,6 +305,9 @@ check_header netatalk/at.h USE_APPLETALK check_header netrom/netrom.h USE_NETROM check_header netrose/rose.h USE_ROSE +check_header neteconet/ec.h USE_NETECONET +check_header netax25/ax25.h USE_NETAX25 +check_header netipx/ipx.h USE_IPX rm -f "$TMP" "$TMP.log" "$TMP.c" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/trinity-1.7+git.20170813/include/arch-sh.h new/trinity-1.7+git.20170825/include/arch-sh.h --- old/trinity-1.7+git.20170813/include/arch-sh.h 2017-08-13 23:55:08.000000000 +0200 +++ new/trinity-1.7+git.20170825/include/arch-sh.h 2017-08-25 17:32:31.000000000 +0200 @@ -2,7 +2,7 @@ #include <stdint.h> -#if __WORDSIZE == 64 +#if WORD_BIT == 64 #define KERNEL_ADDR 0xfffff80000000000 #define MODULE_ADDR 0xffffffffa0000000L // FIXME: Placeholder #define TASK_SIZE ~0UL diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/trinity-1.7+git.20170813/include/compat.h new/trinity-1.7+git.20170825/include/compat.h --- old/trinity-1.7+git.20170813/include/compat.h 2017-08-13 23:55:08.000000000 +0200 +++ new/trinity-1.7+git.20170825/include/compat.h 2017-08-25 17:32:31.000000000 +0200 @@ -1,5 +1,7 @@ #pragma once +#include <sys/socket.h> + /* bits/eventfd.h */ #ifndef EFD_SEMAPHORE #define EFD_SEMAPHORE 1 @@ -836,7 +838,6 @@ /* linux/nfc.h */ #ifndef sockaddr_nfc -#include <bits/sockaddr.h> #include <linux/types.h> struct sockaddr_nfc { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/trinity-1.7+git.20170813/include/syscalls-sh.h new/trinity-1.7+git.20170825/include/syscalls-sh.h --- old/trinity-1.7+git.20170813/include/syscalls-sh.h 2017-08-13 23:55:08.000000000 +0200 +++ new/trinity-1.7+git.20170825/include/syscalls-sh.h 2017-08-25 17:32:31.000000000 +0200 @@ -6,7 +6,7 @@ #include <stdint.h> -#if __WORDSIZE == 64 +#if WORD_BIT == 64 /* arch/sh/kernel/syscalls_64.S */ struct syscalltable syscalls_sh[] = { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/trinity-1.7+git.20170813/include/types.h new/trinity-1.7+git.20170825/include/types.h --- old/trinity-1.7+git.20170813/include/types.h 2017-08-13 23:55:08.000000000 +0200 +++ new/trinity-1.7+git.20170825/include/types.h 2017-08-25 17:32:31.000000000 +0200 @@ -1,8 +1,8 @@ #pragma once -#include <sys/types.h> +#include <stdint.h> typedef enum { FALSE = 0, TRUE = 1 } bool; -typedef __uint32_t u32; -typedef __uint64_t u64; +typedef uint32_t u32; +typedef uint64_t u64; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/trinity-1.7+git.20170813/include/utils.h new/trinity-1.7+git.20170825/include/utils.h --- old/trinity-1.7+git.20170813/include/utils.h 2017-08-13 23:55:08.000000000 +0200 +++ new/trinity-1.7+git.20170825/include/utils.h 2017-08-25 17:32:31.000000000 +0200 @@ -1,5 +1,6 @@ #pragma once +#include <sys/types.h> #include <sys/mman.h> #include <stdlib.h> #include <stdio.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/trinity-1.7+git.20170813/ioctls/binder.c new/trinity-1.7+git.20170825/ioctls/binder.c --- old/trinity-1.7+git.20170813/ioctls/binder.c 2017-08-13 23:55:08.000000000 +0200 +++ new/trinity-1.7+git.20170825/ioctls/binder.c 2017-08-25 17:32:31.000000000 +0200 @@ -1,6 +1,7 @@ #include <inttypes.h> #include <stdlib.h> #include <linux/ioctl.h> +#include <sys/types.h> #define __user /* drivers/staging/android/binder.h */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/trinity-1.7+git.20170813/ioctls/snd.c new/trinity-1.7+git.20170825/ioctls/snd.c --- old/trinity-1.7+git.20170813/ioctls/snd.c 2017-08-13 23:55:08.000000000 +0200 +++ new/trinity-1.7+git.20170825/ioctls/snd.c 2017-08-25 17:32:31.000000000 +0200 @@ -2,6 +2,7 @@ #include <stdio.h> #include <stdlib.h> #include <inttypes.h> +#include <time.h> #include <linux/types.h> #include <linux/ioctl.h> #include <sound/asound.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/trinity-1.7+git.20170813/ioctls/vt.c new/trinity-1.7+git.20170825/ioctls/vt.c --- old/trinity-1.7+git.20170813/ioctls/vt.c 2017-08-13 23:55:08.000000000 +0200 +++ new/trinity-1.7+git.20170825/ioctls/vt.c 2017-08-25 17:32:31.000000000 +0200 @@ -2,7 +2,7 @@ #include <sys/ioctl.h> #include <linux/kd.h> #include <linux/serial.h> -#include <sys/termios.h> +#include <termios.h> #include "utils.h" #include "ioctls.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/trinity-1.7+git.20170813/main.c new/trinity-1.7+git.20170825/main.c --- old/trinity-1.7+git.20170813/main.c 2017-08-13 23:55:08.000000000 +0200 +++ new/trinity-1.7+git.20170825/main.c 2017-08-25 17:32:31.000000000 +0200 @@ -547,6 +547,7 @@ case SIGPIPE: case SIGABRT: case SIGBUS: + case SIGILL: if (stop == TRUE) debugf("Child %d (pid %d) was stopped by %s\n", childno, pid, strsignal(WSTOPSIG(childstatus))); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/trinity-1.7+git.20170813/net/proto-ax25.c new/trinity-1.7+git.20170825/net/proto-ax25.c --- old/trinity-1.7+git.20170813/net/proto-ax25.c 2017-08-13 23:55:08.000000000 +0200 +++ new/trinity-1.7+git.20170825/net/proto-ax25.c 2017-08-25 17:32:31.000000000 +0200 @@ -1,3 +1,4 @@ +#ifdef USE_NETAX25 #include <stdlib.h> #include <sys/types.h> #include <sys/socket.h> @@ -53,3 +54,4 @@ .valid_triplets = ax25_triplets, .nr_triplets = ARRAY_SIZE(ax25_triplets), }; +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/trinity-1.7+git.20170813/net/proto-econet.c new/trinity-1.7+git.20170825/net/proto-econet.c --- old/trinity-1.7+git.20170813/net/proto-econet.c 2017-08-13 23:55:08.000000000 +0200 +++ new/trinity-1.7+git.20170825/net/proto-econet.c 2017-08-25 17:32:31.000000000 +0200 @@ -1,3 +1,4 @@ +#ifdef USE_NETECONET #include <sys/types.h> #include <sys/socket.h> #include <sys/un.h> @@ -36,3 +37,5 @@ .valid_triplets = econet_triplet, .nr_triplets = ARRAY_SIZE(econet_triplet), }; + +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/trinity-1.7+git.20170813/net/proto-ipx.c new/trinity-1.7+git.20170825/net/proto-ipx.c --- old/trinity-1.7+git.20170813/net/proto-ipx.c 2017-08-13 23:55:08.000000000 +0200 +++ new/trinity-1.7+git.20170825/net/proto-ipx.c 2017-08-25 17:32:31.000000000 +0200 @@ -1,3 +1,4 @@ +#ifdef USE_IPX #include <sys/types.h> #include <sys/socket.h> #include <sys/un.h> @@ -43,3 +44,5 @@ .valid_triplets = ipx_triplet, .nr_triplets = ARRAY_SIZE(ipx_triplet), }; + +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/trinity-1.7+git.20170813/net/protocols.c new/trinity-1.7+git.20170825/net/protocols.c --- old/trinity-1.7+git.20170813/net/protocols.c 2017-08-13 23:55:08.000000000 +0200 +++ new/trinity-1.7+git.20170825/net/protocols.c 2017-08-25 17:32:31.000000000 +0200 @@ -5,8 +5,12 @@ const struct protoptr net_protocols[TRINITY_PF_MAX] = { [PF_UNIX] = { .proto = &proto_unix }, [PF_INET] = { .proto = &proto_ipv4 }, +#ifdef USE_NETAX25 [PF_AX25] = { .proto = &proto_ax25 }, +#endif +#ifdef USE_IPX [PF_IPX] = { .proto = &proto_ipx }, +#endif #ifdef USE_APPLETALK [PF_APPLETALK] = { .proto = &proto_appletalk }, #endif @@ -16,7 +20,9 @@ #endif [PF_DECnet] = { .proto = &proto_decnet }, [PF_PACKET] = { .proto = &proto_packet }, +#ifdef USE_NETECONET [PF_ECONET] = { .proto = &proto_econet }, +#endif #ifdef USE_RDS [PF_RDS] = { .proto = &proto_rds }, #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/trinity-1.7+git.20170813/pathnames.c new/trinity-1.7+git.20170825/pathnames.c --- old/trinity-1.7+git.20170813/pathnames.c 2017-08-13 23:55:08.000000000 +0200 +++ new/trinity-1.7+git.20170825/pathnames.c 2017-08-25 17:32:31.000000000 +0200 @@ -17,6 +17,13 @@ #include "uid.h" #include "utils.h" +#ifndef FTW_ACTIONRETVAL +#define FTW_ACTIONRETVAL 0 +#define FTW_CONTINUE 0 +#define FTW_SKIP_SUBTREE 0 +#define FTW_STOP 1 +#endif + unsigned int files_in_index = 0; const char **fileindex; @@ -184,7 +191,6 @@ return FTW_CONTINUE; } - static void open_fds_from_path(const char *dirpath) { int before = files_in_index; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/trinity-1.7+git.20170813/rand/interesting-numbers.c new/trinity-1.7+git.20170825/rand/interesting-numbers.c --- old/trinity-1.7+git.20170813/rand/interesting-numbers.c 2017-08-13 23:55:08.000000000 +0200 +++ new/trinity-1.7+git.20170825/rand/interesting-numbers.c 2017-08-25 17:32:31.000000000 +0200 @@ -57,7 +57,7 @@ } } -#if __WORDSIZE != 32 +#if WORD_BIT != 32 static unsigned long per_arch_interesting_addr(unsigned long low) { int i = 0; @@ -77,7 +77,7 @@ return i | low; } -#endif /* __WORDSIZE */ +#endif /* WORD_BIT */ unsigned long get_interesting_value(void) { @@ -93,7 +93,7 @@ } low = (rnd() & 0xf) ? low : plus_minus_two(low); // 1 in 16 call plus_minus_two -#if __WORDSIZE != 32 +#if WORD_BIT != 32 if (RAND_BOOL()) { // FIXME: This should likely be less aggressive than 50/50 switch (rnd() % 11) { @@ -111,6 +111,6 @@ } } -#endif /* __WORDSIZE */ +#endif /* WORD_BIT */ return low; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/trinity-1.7+git.20170813/rand/random.c new/trinity-1.7+git.20170825/rand/random.c --- old/trinity-1.7+git.20170813/rand/random.c 2017-08-13 23:55:08.000000000 +0200 +++ new/trinity-1.7+git.20170825/rand/random.c 2017-08-25 17:32:31.000000000 +0200 @@ -39,12 +39,12 @@ } /* - * Pick a random power of two between 2^0 and 2^(__WORDSIZE-1) + * Pick a random power of two between 2^0 and 2^(WORD_BIT-1) */ unsigned long rand_single_bit(unsigned char size) { - if (size > __WORDSIZE) - size = __WORDSIZE; + if (size > WORD_BIT) + size = WORD_BIT; return (1UL << (rnd() % size)); } @@ -73,7 +73,7 @@ r = (r << 8) | r; r = (r << 16) | r; -#if __WORDSIZE == 64 +#if WORD_BIT == 64 r = (r << 32) | r; #endif return r; @@ -243,7 +243,7 @@ rounds = rnd() % 4; for (i = 0; i < rounds; i++) - r |= (1UL << ((__WORDSIZE - 1) - (rnd() % 8))); + r |= (1UL << ((WORD_BIT - 1) - (rnd() % 8))); } /* Sometimes flip sign */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/trinity-1.7+git.20170813/scripts/gen-versionh.sh new/trinity-1.7+git.20170825/scripts/gen-versionh.sh --- old/trinity-1.7+git.20170813/scripts/gen-versionh.sh 2017-08-13 23:55:08.000000000 +0200 +++ new/trinity-1.7+git.20170825/scripts/gen-versionh.sh 2017-08-25 17:32:31.000000000 +0200 @@ -48,3 +48,5 @@ # devel=0 : release version. makefilever fi + +touch ${HEADER} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/trinity-1.7+git.20170813/syscall.c new/trinity-1.7+git.20170825/syscall.c --- old/trinity-1.7+git.20170813/syscall.c 2017-08-13 23:55:08.000000000 +0200 +++ new/trinity-1.7+git.20170825/syscall.c 2017-08-25 17:32:31.000000000 +0200 @@ -167,6 +167,7 @@ if (pid_alive(extrapid) == TRUE) usleep(100); + lock(&rec->lock); while (pid == 0) { int childstatus; @@ -175,6 +176,7 @@ kill(extrapid, SIGKILL); usleep(1000); } + unlock(&rec->lock); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/trinity-1.7+git.20170813/syscalls/mremap.c new/trinity-1.7+git.20170825/syscalls/mremap.c --- old/trinity-1.7+git.20170813/syscalls/mremap.c 2017-08-13 23:55:08.000000000 +0200 +++ new/trinity-1.7+git.20170825/syscalls/mremap.c 2017-08-25 17:32:31.000000000 +0200 @@ -33,7 +33,7 @@ if (rec->a4 & MREMAP_FIXED) { unsigned long align = RAND_ARRAY(alignments); - unsigned int shift = (__WORDSIZE / 2) - 1; + unsigned int shift = (WORD_BIT / 2) - 1; newaddr = RAND_BYTE(); newaddr <<= shift; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/trinity-1.7+git.20170813/syscalls/prctl.c new/trinity-1.7+git.20170825/syscalls/prctl.c --- old/trinity-1.7+git.20170813/syscalls/prctl.c 2017-08-13 23:55:08.000000000 +0200 +++ new/trinity-1.7+git.20170825/syscalls/prctl.c 2017-08-25 17:32:31.000000000 +0200 @@ -4,7 +4,6 @@ */ #include <stdlib.h> -#include <linux/prctl.h> #ifdef USE_SECCOMP #include <linux/seccomp.h> #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/trinity-1.7+git.20170813/syscalls/rename.c new/trinity-1.7+git.20170825/syscalls/rename.c --- old/trinity-1.7+git.20170813/syscalls/rename.c 2017-08-13 23:55:08.000000000 +0200 +++ new/trinity-1.7+git.20170825/syscalls/rename.c 2017-08-25 17:32:31.000000000 +0200 @@ -40,9 +40,10 @@ #define RENAME_NOREPLACE (1 << 0) /* Don't overwrite target */ #define RENAME_EXCHANGE (1 << 1) /* Exchange source and dest */ +#define RENAME_WHITEOUT (1 << 2) /* Whiteout source */ static unsigned long renameat2_flags[] = { - RENAME_NOREPLACE, RENAME_EXCHANGE, + RENAME_NOREPLACE, RENAME_EXCHANGE, RENAME_WHITEOUT, }; struct syscallentry syscall_renameat2 = { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/trinity-1.7+git.20170813/syscalls/select.c new/trinity-1.7+git.20170825/syscalls/select.c --- old/trinity-1.7+git.20170813/syscalls/select.c 2017-08-13 23:55:08.000000000 +0200 +++ new/trinity-1.7+git.20170825/syscalls/select.c 2017-08-25 17:32:31.000000000 +0200 @@ -12,6 +12,10 @@ #include "sanitise.h" #include "utils.h" +#ifndef __NFDBITS +#define __NFDBITS NFDBITS +#endif + static void sanitise_select(struct syscallrecord *rec) { unsigned int i;