patches/strace/4.5.16/180-undef-syscall.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Fri Nov 04 19:22:29 2011 +0100 (2011-11-04)
changeset 2735 f09ed6dd71a3
parent 746 b150d6f590fc
permissions -rw-r--r--
kernel/linux: fix packed attribute in exported headers

UBI headers (and maybe others as well) are broken because the 'packed'
attribute is not sanitised when the headers are exported to userspace.

Apply the fix from upstream:
https://git.kernel.org/?p=linux/kernel/git/torvalds/linux.git;a=commitdiff;h=f210735fe2f17a6225432ee3d1239bcf23a8659c

(Also, buildroot does the same, BTW)

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
     1 diff -dur strace-4.5.16.orig/linux/syscallent.h strace-4.5.16/linux/syscallent.h
     2 --- strace-4.5.16.orig/linux/syscallent.h	2006-10-16 03:17:52.000000000 +0200
     3 +++ strace-4.5.16/linux/syscallent.h	2007-07-14 19:30:16.000000000 +0200
     4 @@ -130,7 +130,11 @@
     5  	{ 2,	TF,	sys_statfs,		"statfs"	}, /* 99 */
     6  	{ 2,	TD,	sys_fstatfs,		"fstatfs"	}, /* 100 */
     7  	{ 3,	0,	sys_ioperm,		"ioperm"	}, /* 101 */
     8 -	{ 2,	TD,	sys_socketcall,		"socketcall", SYS_socketcall }, /* 102 */
     9 +	{ 2,	TD,	sys_socketcall,		"socketcall"
    10 +#ifdef __NR_socketcall
    11 +	    , SYS_socketcall
    12 +#endif
    13 +								}, /* 102 */
    14  	{ 3,	0,	sys_syslog,		"syslog"	}, /* 103 */
    15  	{ 3,	0,	sys_setitimer,		"setitimer"	}, /* 104 */
    16  	{ 2,	0,	sys_getitimer,		"getitimer"	}, /* 105 */
    17 @@ -145,7 +149,11 @@
    18  	{ 4,	TP,	sys_wait4,		"wait4", SYS_wait4 }, /* 114 */
    19  	{ 1,	0,	sys_swapoff,		"swapoff"	}, /* 115 */
    20  	{ 1,	0,	sys_sysinfo,		"sysinfo"	}, /* 116 */
    21 -	{ 6,	0,	sys_ipc,		"ipc", SYS_ipc }, /* 117 */
    22 +	{ 6,	0,	sys_ipc,		"ipc"
    23 +#ifdef __NR_ipc
    24 +	    , SYS_ipc
    25 +#endif
    26 +								}, /* 117 */
    27  	{ 1,	TD,	sys_fsync,		"fsync"		}, /* 118 */
    28  	{ 1,	TS,	sys_sigreturn,		"sigreturn"	}, /* 119 */
    29  	{ 5,	TP,	sys_clone,		"clone", SYS_clone }, /* 120 */
    30 @@ -282,7 +290,11 @@
    31  	{ 3,	0,	sys_io_cancel,		"io_cancel"	}, /* 249 */
    32  	{ 5,	0,	sys_fadvise64,		"fadvise64"	}, /* 250 */
    33  	{ 5,	0,	printargs,		"SYS_251"	}, /* 251 */
    34 -	{ 1,	TP,	sys_exit,		"exit_group", __NR_exit_group }, /* 252 */
    35 +	{ 1,	TP,	sys_exit,		"exit_group"
    36 +#ifdef __NR_exit_group
    37 +	    , __NR_exit_group
    38 +#endif
    39 +								}, /* 252 */
    40  	{ 4,	0,	printargs,		"lookup_dcookie"}, /* 253 */
    41  	{ 1,	0,	sys_epoll_create,	"epoll_create"	}, /* 254 */
    42  	{ 4,	TD,	sys_epoll_ctl,		"epoll_ctl"	}, /* 255 */
    43 diff -dur strace-4.5.16.orig/syscall.c strace-4.5.16/syscall.c
    44 --- strace-4.5.16.orig/syscall.c	2007-07-14 19:22:49.000000000 +0200
    45 +++ strace-4.5.16/syscall.c	2007-07-14 19:30:16.000000000 +0200
    46 @@ -2383,14 +2383,18 @@
    47  	switch (known_scno(tcp)) {
    48  #ifdef LINUX
    49  #if !defined (ALPHA) && !defined(SPARC) && !defined(SPARC64) && !defined(MIPS) && !defined(HPPA)
    50 +#ifdef __NR_socketcall
    51  	case SYS_socketcall:
    52  		decode_subcall(tcp, SYS_socket_subcall,
    53  			SYS_socket_nsubcalls, deref_style);
    54  		break;
    55 +#endif
    56 +#ifdef __NR_ipc
    57  	case SYS_ipc:
    58  		decode_subcall(tcp, SYS_ipc_subcall,
    59  			SYS_ipc_nsubcalls, shift_style);
    60  		break;
    61 +#endif
    62  #endif /* !ALPHA && !MIPS && !SPARC && !SPARC64 && !HPPA */
    63  #if defined (SPARC) || defined (SPARC64)
    64  	case SYS_socketcall: