Hello community, here is the log from the commit of package trinity for openSUSE:Factory checked in at 2017-07-25 11:40:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/trinity (Old) and /work/SRC/openSUSE:Factory/.trinity.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "trinity" Tue Jul 25 11:40:52 2017 rev:41 rq:512274 version:1.7+git.20170712 Changes: -------- --- /work/SRC/openSUSE:Factory/trinity/trinity.changes 2017-06-23 09:17:47.459300048 +0200 +++ /work/SRC/openSUSE:Factory/.trinity.new/trinity.changes 2017-07-25 11:41:17.272789442 +0200 @@ -1,0 +2,17 @@ +Mon Jul 24 13:18:23 UTC 2017 - [email protected] + +- Update to version 1.7+git.20170712: + * remove old debug leftover + * remove the syscall-in-subchild code. + * make the new seed be sequential (sort of) + * move the 'are we done' check to the generic child code. + * Include sys/io.h for UIO_MAXIOV symbol. + * ioctls/vfs.c: add more ioctls from linux/fs.h + * ioctls/vfs.c: FS_IOC_GETFSMAP + * get_syscall_entry: remove SYSCALL_OFFSET + * add new TCP setsockopts + * update setsockopt options + * special case tls for TCP_ULP + * update netlink protocols + +------------------------------------------------------------------- Old: ---- trinity-1.7+git.20170612.tar.xz New: ---- trinity-1.7+git.20170712.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ trinity.spec ++++++ --- /var/tmp/diff_new_pack.8aQP2v/_old 2017-07-25 11:41:17.828710955 +0200 +++ /var/tmp/diff_new_pack.8aQP2v/_new 2017-07-25 11:41:17.832710391 +0200 @@ -16,9 +16,9 @@ # -%define version_unconverted 1.7+git.20170612 +%define version_unconverted 1.7+git.20170712 Name: trinity -Version: 1.7+git.20170612 +Version: 1.7+git.20170712 Release: 0 Summary: A Linux System call fuzz tester License: GPL-2.0 ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.8aQP2v/_old 2017-07-25 11:41:17.884703050 +0200 +++ /var/tmp/diff_new_pack.8aQP2v/_new 2017-07-25 11:41:17.888702485 +0200 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">git://github.com/kernelslacker/trinity</param> - <param name="changesrevision">f21c0a62f708688f3df574911525e2b14be01d5e</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">37ae2cceddb7e4cd055b2cf40ad25d57e00c4f80</param></service></servicedata> \ No newline at end of file ++++++ trinity-1.7+git.20170612.tar.xz -> trinity-1.7+git.20170712.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/trinity-1.7+git.20170612/child.c new/trinity-1.7+git.20170712/child.c --- old/trinity-1.7+git.20170612/child.c 2017-06-12 21:21:10.000000000 +0200 +++ new/trinity-1.7+git.20170712/child.c 2017-07-12 23:06:12.000000000 +0200 @@ -527,6 +527,13 @@ if (ops->flags & ONESHOT) loops = 0; + + if (syscalls_todo) { + if (shm->stats.op_count >= syscalls_todo) { + shm->exit_reason = EXIT_REACHED_COUNT; + goto out; + } + } } enable_coredumps(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/trinity-1.7+git.20170612/childops/random-syscall.c new/trinity-1.7+git.20170712/childops/random-syscall.c --- old/trinity-1.7+git.20170612/childops/random-syscall.c 2017-06-12 21:21:10.000000000 +0200 +++ new/trinity-1.7+git.20170712/childops/random-syscall.c 2017-07-12 23:06:12.000000000 +0200 @@ -110,53 +110,9 @@ rec->nr = syscallnr; unlock(&rec->lock); - if (syscalls_todo) { - if (shm->stats.op_count >= syscalls_todo) { - shm->exit_reason = EXIT_REACHED_COUNT; - return FAIL; - } - } - return TRUE; } -/* -static bool do_syscall_in_child(struct syscallrecord *rec, struct childdata *child) -{ - pid_t pid; - - pid = fork(); - if (pid == 0) { - // child - do_syscall(rec); - _exit(EXIT_SUCCESS); - } else if (pid > 0) { - // parent - int childret = 0; - int childstatus; - - // wait for child to exit, or kill it. - while (childret == 0) { - - clock_gettime(CLOCK_MONOTONIC, &child->tp); - - if (pid_alive(pid) == TRUE) { - kill_pid(pid); - childret = waitpid(pid, &childstatus, WUNTRACED | WCONTINUED | WNOHANG); - if (childret == 0) - usleep(10000); - } - } - // and do the same work in the parent. - do_syscall(rec); - return TRUE; - } else { - // fork failed - return FALSE; - } -} -*/ - bool random_syscall(struct childdata *child) { struct syscallrecord *rec; @@ -174,12 +130,6 @@ output_syscall_prefix(rec); -/* - if (ONE_IN(100)) { - if (do_syscall_in_child(rec, child) == FALSE) - goto fail; - } else -*/ do_syscall(rec); output_syscall_postfix(rec); @@ -187,6 +137,6 @@ handle_syscall_ret(rec); ret = TRUE; -//fail: + return ret; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/trinity-1.7+git.20170612/configure new/trinity-1.7+git.20170712/configure --- old/trinity-1.7+git.20170612/configure 2017-06-12 21:21:10.000000000 +0200 +++ new/trinity-1.7+git.20170712/configure 2017-07-12 23:06:12.000000000 +0200 @@ -291,6 +291,7 @@ ############################################################################################# check_header linux/caif/caif_socket.h USE_CAIF +check_header linux/fsmap.h USE_FSMAP check_header linux/if_alg.h USE_IF_ALG check_header linux/rds.h USE_RDS check_header linux/vfio.h USE_VFIO diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/trinity-1.7+git.20170612/include/compat.h new/trinity-1.7+git.20170712/include/compat.h --- old/trinity-1.7+git.20170612/include/compat.h 2017-06-12 21:21:10.000000000 +0200 +++ new/trinity-1.7+git.20170712/include/compat.h 2017-07-12 23:06:12.000000000 +0200 @@ -275,6 +275,9 @@ #ifndef NETLINK_CRYPTO #define NETLINK_CRYPTO 21 #endif +#ifndef NETLINK_SMC +#define NETLINK_SMC 22 +#endif #ifndef NETLINK_RX_RING #define NETLINK_RX_RING 6 #define NETLINK_TX_RING 7 @@ -496,6 +499,33 @@ #define SO_CNX_ADVICE 53 #endif +#ifndef SCM_TIMESTAMPING_OPT_STATS +#define SCM_TIMESTAMPING_OPT_STATS 54 +#endif + +#ifndef SO_MEMINFO +#define SO_MEMINFO 55 +#endif + +#ifndef SO_INCOMING_NAPI_ID +#define SO_INCOMING_NAPI_ID 56 +#endif + +#ifndef SO_COOKIE +#define SO_COOKIE 57 +#endif + +#ifndef SCM_TIMESTAMPING_PKTINFO +#define SCM_TIMESTAMPING_PKTINFO 58 +#endif + +#ifndef SO_PEERGROUPS +#define SO_PEERGROUPS 59 +#endif + + + + /* linux/tcp.h */ #ifndef TCP_COOKIE_TRANSACTIONS #define TCP_COOKIE_TRANSACTIONS 15 @@ -558,6 +588,14 @@ #define TCP_FASTOPEN_CONNECT 30 #endif +#ifndef TCP_ULP +#define TCP_ULP 31 +#endif + +#ifndef TCP_MD5SIG_EXT +#define TCP_MD5SIG_EXT 32 +#endif + /* linux/if_packet.h */ #ifndef PACKET_VNET_HDR #define PACKET_VNET_HDR 15 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/trinity-1.7+git.20170612/ioctls/vfs.c new/trinity-1.7+git.20170712/ioctls/vfs.c --- old/trinity-1.7+git.20170612/ioctls/vfs.c 2017-06-12 21:21:10.000000000 +0200 +++ new/trinity-1.7+git.20170712/ioctls/vfs.c 2017-07-12 23:06:12.000000000 +0200 @@ -1,6 +1,10 @@ #include <stdio.h> #include <linux/fiemap.h> #include <linux/fs.h> +#include <linux/blktrace_api.h> +#ifdef USE_FSMAP +#include <linux/fsmap.h> +#endif #include <linux/ioctl.h> #include <asm/ioctls.h> #include "ioctls.h" @@ -114,6 +118,135 @@ { .name = "FIONREAD", .request = FIONREAD, }, { .name = "FS_IOC_RESVSP", .request = FS_IOC_RESVSP, }, { .name = "FS_IOC_RESVSP64", .request = FS_IOC_RESVSP64, }, +#ifdef BLKROSET + { .name = "BLKROSET", .request = BLKROSET, }, +#endif +#ifdef BLKROGET + { .name = "BLKROGET", .request = BLKROGET, }, +#endif +#ifdef BLKRRPART + { .name = "BLKRRPART", .request = BLKRRPART, }, +#endif +#ifdef BLKGETSIZE + { .name = "BLKGETSIZE", .request = BLKGETSIZE, }, +#endif +#ifdef BLKFLSBUF + { .name = "BLKFLSBUF", .request = BLKFLSBUF, }, +#endif +#ifdef BLKRASET + { .name = "BLKRASET", .request = BLKRASET, }, +#endif +#ifdef BLKRAGET + { .name = "BLKRAGET", .request = BLKRAGET, }, +#endif +#ifdef BLKFRASET + { .name = "BLKFRASET", .request = BLKFRASET, }, +#endif +#ifdef BLKFRAGET + { .name = "BLKFRAGET", .request = BLKFRAGET, }, +#endif +#ifdef BLKSECTSET + { .name = "BLKSECTSET", .request = BLKSECTSET, }, +#endif +#ifdef BLKSECTGET + { .name = "BLKSECTGET", .request = BLKSECTGET, }, +#endif +#ifdef BLKSSZGET + { .name = "BLKSSZGET", .request = BLKSSZGET, }, +#endif +#ifdef BLKBSZGET + { .name = "BLKBSZGET", .request = BLKBSZGET, }, +#endif +#ifdef BLKBSZSET + { .name = "BLKBSZSET", .request = BLKBSZSET, }, +#endif +#ifdef BLKGETSIZE64 + { .name = "BLKGETSIZE64", .request = BLKGETSIZE64, }, +#endif +#ifdef BLKTRACESETUP + { .name = "BLKTRACESETUP", .request = BLKTRACESETUP, }, +#endif +#ifdef BLKTRACESTART + { .name = "BLKTRACESTART", .request = BLKTRACESTART, }, +#endif +#ifdef BLKTRACESTOP + { .name = "BLKTRACESTOP", .request = BLKTRACESTOP, }, +#endif +#ifdef BLKTRACETEARDOWN + { .name = "BLKTRACETEARDOWN", .request = BLKTRACETEARDOWN, }, +#endif +#ifdef BLKDISCARD + { .name = "BLKDISCARD", .request = BLKDISCARD, }, +#endif +#ifdef BLKIOMIN + { .name = "BLKIOMIN", .request = BLKIOMIN, }, +#endif +#ifdef BLKIOOPT + { .name = "BLKIOOPT", .request = BLKIOOPT, }, +#endif +#ifdef BLKALIGNOFF + { .name = "BLKALIGNOFF", .request = BLKALIGNOFF, }, +#endif +#ifdef BLKPBSZGET + { .name = "BLKPBSZGET", .request = BLKPBSZGET, }, +#endif +#ifdef BLKDISCARDZEROES + { .name = "BLKDISCARDZEROES", .request = BLKDISCARDZEROES, }, +#endif +#ifdef BLKSECDISCARD + { .name = "BLKSECDISCARD", .request = BLKSECDISCARD, }, +#endif +#ifdef BLKROTATIONAL + { .name = "BLKROTATIONAL", .request = BLKROTATIONAL, }, +#endif +#ifdef BLKZEROOUT + { .name = "BLKZEROOUT", .request = BLKZEROOUT, }, +#endif +#ifdef FITRIM + { .name = "FITRIM", .request = FITRIM, }, +#endif +#ifdef FS_IOC_GETFLAGS + { .name = "FS_IOC_GETFLAGS", .request = FS_IOC_GETFLAGS, }, +#endif +#ifdef FS_IOC_SETFLAGS + { .name = "FS_IOC_SETFLAGS", .request = FS_IOC_SETFLAGS, }, +#endif +#ifdef FS_IOC_GETVERSION + { .name = "FS_IOC_GETVERSION", .request = FS_IOC_GETVERSION, }, +#endif +#ifdef FS_IOC_SETVERSION + { .name = "FS_IOC_SETVERSION", .request = FS_IOC_SETVERSION, }, +#endif +#ifdef FS_IOC32_GETFLAGS + { .name = "FS_IOC32_GETFLAGS", .request = FS_IOC32_GETFLAGS, }, +#endif +#ifdef FS_IOC32_SETFLAGS + { .name = "FS_IOC32_SETFLAGS", .request = FS_IOC32_SETFLAGS, }, +#endif +#ifdef FS_IOC32_GETVERSION + { .name = "FS_IOC32_GETVERSION", .request = FS_IOC32_GETVERSION, }, +#endif +#ifdef FS_IOC32_SETVERSION + { .name = "FS_IOC32_SETVERSION", .request = FS_IOC32_SETVERSION, }, +#endif +#ifdef FS_IOC_FSGETXATTR + { .name = "FS_IOC_FSGETXATTR", .request = FS_IOC_FSGETXATTR, }, +#endif +#ifdef FS_IOC_FSSETXATTR + { .name = "FS_IOC_FSSETXATTR", .request = FS_IOC_FSSETXATTR, }, +#endif +#ifdef FS_IOC_SET_ENCRYPTION_POLICY + { .name = "FS_IOC_SET_ENCRYPTION_POLICY", .request = FS_IOC_SET_ENCRYPTION_POLICY, }, +#endif +#ifdef FS_IOC_GET_ENCRYPTION_PWSALT + { .name = "FS_IOC_GET_ENCRYPTION_PWSALT", .request = FS_IOC_GET_ENCRYPTION_PWSALT, }, +#endif +#ifdef FS_IOC_GET_ENCRYPTION_POLICY + { .name = "FS_IOC_GET_ENCRYPTION_POLICY", .request = FS_IOC_GET_ENCRYPTION_POLICY, }, +#endif +#ifdef FS_IOC_GETFSMAP + { .name = "FS_IOC_GETFSMAP", .request = FS_IOC_GETFSMAP, }, +#endif }; static const struct ioctl_group vfs_grp = { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/trinity-1.7+git.20170612/net/proto-ip-tcp.c new/trinity-1.7+git.20170712/net/proto-ip-tcp.c --- old/trinity-1.7+git.20170612/net/proto-ip-tcp.c 2017-06-12 21:21:10.000000000 +0200 +++ new/trinity-1.7+git.20170712/net/proto-ip-tcp.c 2017-07-12 23:06:12.000000000 +0200 @@ -13,10 +13,17 @@ TCP_THIN_DUPACK, TCP_USER_TIMEOUT, TCP_REPAIR, TCP_REPAIR_QUEUE, TCP_QUEUE_SEQ, TCP_REPAIR_OPTIONS, TCP_FASTOPEN, TCP_TIMESTAMP, TCP_NOTSENT_LOWAT, TCP_CC_INFO, TCP_SAVE_SYN, TCP_SAVED_SYN, - TCP_REPAIR_WINDOW, TCP_FASTOPEN_CONNECT, + TCP_REPAIR_WINDOW, TCP_FASTOPEN_CONNECT, TCP_ULP, TCP_MD5SIG_EXT, }; void tcp_setsockopt(struct sockopt *so, __unused__ struct socket_triplet *triplet) { so->optname = RAND_ARRAY(tcp_opts); + + if (so->optname == TCP_ULP) { + char *ptr = (char *) so->optval; + + sprintf(ptr, "tls"); + so->optlen = sizeof("tls"); + } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/trinity-1.7+git.20170612/net/proto-ipv4.c new/trinity-1.7+git.20170712/net/proto-ipv4.c --- old/trinity-1.7+git.20170612/net/proto-ipv4.c 2017-06-12 21:21:10.000000000 +0200 +++ new/trinity-1.7+git.20170712/net/proto-ipv4.c 2017-07-12 23:06:12.000000000 +0200 @@ -1,6 +1,7 @@ #include <sys/types.h> #include <sys/socket.h> #include <sys/un.h> +#include <sys/uio.h> #include <netinet/in.h> #include <netinet/udp.h> #include <stdlib.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/trinity-1.7+git.20170612/net/proto-netlink.c new/trinity-1.7+git.20170712/net/proto-netlink.c --- old/trinity-1.7+git.20170612/net/proto-netlink.c 2017-06-12 21:21:10.000000000 +0200 +++ new/trinity-1.7+git.20170712/net/proto-netlink.c 2017-07-12 23:06:12.000000000 +0200 @@ -51,35 +51,47 @@ } static struct socket_triplet netlink_triplets[] = { + { .family = PF_NETLINK, .protocol = NETLINK_ROUTE, .type = SOCK_DGRAM }, + { .family = PF_NETLINK, .protocol = NETLINK_USERSOCK, .type = SOCK_DGRAM }, + { .family = PF_NETLINK, .protocol = NETLINK_SOCK_DIAG, .type = SOCK_DGRAM }, + { .family = PF_NETLINK, .protocol = NETLINK_NFLOG, .type = SOCK_DGRAM }, + { .family = PF_NETLINK, .protocol = NETLINK_XFRM, .type = SOCK_DGRAM }, + { .family = PF_NETLINK, .protocol = NETLINK_SELINUX, .type = SOCK_DGRAM }, + { .family = PF_NETLINK, .protocol = NETLINK_ISCSI, .type = SOCK_DGRAM }, { .family = PF_NETLINK, .protocol = NETLINK_AUDIT, .type = SOCK_DGRAM }, + { .family = PF_NETLINK, .protocol = NETLINK_FIB_LOOKUP, .type = SOCK_DGRAM }, { .family = PF_NETLINK, .protocol = NETLINK_CONNECTOR, .type = SOCK_DGRAM }, + { .family = PF_NETLINK, .protocol = NETLINK_NETFILTER, .type = SOCK_DGRAM }, + { .family = PF_NETLINK, .protocol = NETLINK_IP6_FW, .type = SOCK_DGRAM }, { .family = PF_NETLINK, .protocol = NETLINK_DNRTMSG, .type = SOCK_DGRAM }, - { .family = PF_NETLINK, .protocol = NETLINK_FIB_LOOKUP, .type = SOCK_DGRAM }, - { .family = PF_NETLINK, .protocol = NETLINK_GENERIC, .type = SOCK_DGRAM }, - { .family = PF_NETLINK, .protocol = NETLINK_ISCSI, .type = SOCK_DGRAM }, { .family = PF_NETLINK, .protocol = NETLINK_KOBJECT_UEVENT, .type = SOCK_DGRAM }, - { .family = PF_NETLINK, .protocol = NETLINK_NETFILTER, .type = SOCK_DGRAM }, - { .family = PF_NETLINK, .protocol = NETLINK_ROUTE, .type = SOCK_DGRAM }, + { .family = PF_NETLINK, .protocol = NETLINK_GENERIC, .type = SOCK_DGRAM }, { .family = PF_NETLINK, .protocol = NETLINK_SCSITRANSPORT, .type = SOCK_DGRAM }, - { .family = PF_NETLINK, .protocol = NETLINK_SELINUX, .type = SOCK_DGRAM }, - { .family = PF_NETLINK, .protocol = NETLINK_SOCK_DIAG, .type = SOCK_DGRAM }, - { .family = PF_NETLINK, .protocol = NETLINK_USERSOCK, .type = SOCK_DGRAM }, - { .family = PF_NETLINK, .protocol = NETLINK_XFRM, .type = SOCK_DGRAM }, + { .family = PF_NETLINK, .protocol = NETLINK_ECRYPTFS, .type = SOCK_DGRAM }, + { .family = PF_NETLINK, .protocol = NETLINK_RDMA, .type = SOCK_DGRAM }, + { .family = PF_NETLINK, .protocol = NETLINK_CRYPTO, .type = SOCK_DGRAM }, + { .family = PF_NETLINK, .protocol = NETLINK_SMC, .type = SOCK_DGRAM }, + { .family = PF_NETLINK, .protocol = NETLINK_ROUTE, .type = SOCK_RAW }, + { .family = PF_NETLINK, .protocol = NETLINK_USERSOCK, .type = SOCK_RAW }, + { .family = PF_NETLINK, .protocol = NETLINK_SOCK_DIAG, .type = SOCK_RAW }, + { .family = PF_NETLINK, .protocol = NETLINK_NFLOG, .type = SOCK_RAW }, + { .family = PF_NETLINK, .protocol = NETLINK_XFRM, .type = SOCK_RAW }, + { .family = PF_NETLINK, .protocol = NETLINK_SELINUX, .type = SOCK_RAW }, + { .family = PF_NETLINK, .protocol = NETLINK_ISCSI, .type = SOCK_RAW }, { .family = PF_NETLINK, .protocol = NETLINK_AUDIT, .type = SOCK_RAW }, + { .family = PF_NETLINK, .protocol = NETLINK_FIB_LOOKUP, .type = SOCK_RAW }, { .family = PF_NETLINK, .protocol = NETLINK_CONNECTOR, .type = SOCK_RAW }, + { .family = PF_NETLINK, .protocol = NETLINK_NETFILTER, .type = SOCK_RAW }, + { .family = PF_NETLINK, .protocol = NETLINK_IP6_FW, .type = SOCK_RAW }, { .family = PF_NETLINK, .protocol = NETLINK_DNRTMSG, .type = SOCK_RAW }, - { .family = PF_NETLINK, .protocol = NETLINK_FIB_LOOKUP, .type = SOCK_RAW }, - { .family = PF_NETLINK, .protocol = NETLINK_GENERIC, .type = SOCK_RAW }, - { .family = PF_NETLINK, .protocol = NETLINK_ISCSI, .type = SOCK_RAW }, { .family = PF_NETLINK, .protocol = NETLINK_KOBJECT_UEVENT, .type = SOCK_RAW }, - { .family = PF_NETLINK, .protocol = NETLINK_NETFILTER, .type = SOCK_RAW }, - { .family = PF_NETLINK, .protocol = NETLINK_ROUTE, .type = SOCK_RAW }, + { .family = PF_NETLINK, .protocol = NETLINK_GENERIC, .type = SOCK_RAW }, { .family = PF_NETLINK, .protocol = NETLINK_SCSITRANSPORT, .type = SOCK_RAW }, - { .family = PF_NETLINK, .protocol = NETLINK_SELINUX, .type = SOCK_RAW }, - { .family = PF_NETLINK, .protocol = NETLINK_SOCK_DIAG, .type = SOCK_RAW }, - { .family = PF_NETLINK, .protocol = NETLINK_USERSOCK, .type = SOCK_RAW }, - { .family = PF_NETLINK, .protocol = NETLINK_XFRM, .type = SOCK_RAW }, + { .family = PF_NETLINK, .protocol = NETLINK_ECRYPTFS, .type = SOCK_RAW }, + { .family = PF_NETLINK, .protocol = NETLINK_RDMA, .type = SOCK_RAW }, + { .family = PF_NETLINK, .protocol = NETLINK_CRYPTO, .type = SOCK_RAW }, + { .family = PF_NETLINK, .protocol = NETLINK_SMC, .type = SOCK_RAW }, /* Hm, TBD diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/trinity-1.7+git.20170612/rand/seed.c new/trinity-1.7+git.20170712/rand/seed.c --- old/trinity-1.7+git.20170612/rand/seed.c 2017-06-12 21:21:10.000000000 +0200 +++ new/trinity-1.7+git.20170712/rand/seed.c 2017-07-12 23:06:12.000000000 +0200 @@ -101,7 +101,7 @@ } /* We are reseeding. */ - shm->seed = rnd(); + shm->seed += max_children; init_msghdr(&reseedmsg.hdr, RESEED); reseedmsg.new_seed = shm->seed; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/trinity-1.7+git.20170612/syscalls/setsockopt.c new/trinity-1.7+git.20170712/syscalls/setsockopt.c --- old/trinity-1.7+git.20170612/syscalls/setsockopt.c 2017-06-12 21:21:10.000000000 +0200 +++ new/trinity-1.7+git.20170712/syscalls/setsockopt.c 2017-07-12 23:06:12.000000000 +0200 @@ -24,7 +24,8 @@ SO_PEEK_OFF, SO_NOFCS, SO_LOCK_FILTER, SO_SELECT_ERR_QUEUE, SO_BUSY_POLL, SO_MAX_PACING_RATE, SO_BPF_EXTENSIONS, SO_INCOMING_CPU, SO_ATTACH_BPF, SO_ATTACH_REUSEPORT_CBPF, SO_ATTACH_REUSEPORT_EBPF, - SO_CNX_ADVICE, + SO_CNX_ADVICE, SCM_TIMESTAMPING_OPT_STATS, SO_MEMINFO, SO_INCOMING_NAPI_ID, + SO_COOKIE, SCM_TIMESTAMPING_PKTINFO, SO_PEERGROUPS, }; static void socket_setsockopt(struct sockopt *so, __unused__ struct socket_triplet *triplet) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/trinity-1.7+git.20170612/tables-biarch.c new/trinity-1.7+git.20170712/tables-biarch.c --- old/trinity-1.7+git.20170612/tables-biarch.c 2017-06-12 21:21:10.000000000 +0200 +++ new/trinity-1.7+git.20170712/tables-biarch.c 2017-07-12 23:06:12.000000000 +0200 @@ -423,7 +423,6 @@ } sendudp((char *) udpmsg, size); - printf("freeing %p\n", udpmsg); free(udpmsg); /* Now send the 32bit syscalls */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/trinity-1.7+git.20170612/tables.c new/trinity-1.7+git.20170712/tables.c --- old/trinity-1.7+git.20170612/tables.c 2017-06-12 21:21:10.000000000 +0200 +++ new/trinity-1.7+git.20170712/tables.c 2017-07-12 23:06:12.000000000 +0200 @@ -673,15 +673,14 @@ */ struct syscallentry * get_syscall_entry(unsigned int callno, bool do32) { - unsigned int offset = callno - SYSCALL_OFFSET; if (biarch == FALSE) - return syscalls[offset].entry; + return syscalls[callno].entry; /* biarch case */ if (do32 == TRUE) - return syscalls_32bit[offset].entry; + return syscalls_32bit[callno].entry; else - return syscalls_64bit[offset].entry; + return syscalls_64bit[callno].entry; } /* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/trinity-1.7+git.20170612/tools/analyze-sockets.c new/trinity-1.7+git.20170712/tools/analyze-sockets.c --- old/trinity-1.7+git.20170612/tools/analyze-sockets.c 2017-06-12 21:21:10.000000000 +0200 +++ new/trinity-1.7+git.20170712/tools/analyze-sockets.c 2017-07-12 23:06:12.000000000 +0200 @@ -133,6 +133,7 @@ { "NETLINK_ECRYPTFS", NETLINK_ECRYPTFS }, { "NETLINK_RDMA", NETLINK_RDMA }, { "NETLINK_CRYPTO", NETLINK_CRYPTO }, + { "NETLINK_SMC", NETLINK_SMC }, }; switch (family) {
