diff options
| author | Dmitry V. Levin <ldv@altlinux.org> | 2014-04-17 13:32:47 +0000 |
|---|---|---|
| committer | Dmitry V. Levin <ldv@altlinux.org> | 2014-04-17 13:39:49 +0000 |
| commit | 7845a42b39e59e904d01e75e21f7bc7eb6462560 (patch) | |
| tree | 048e6aa057d57df773be7b0f9536960323af95bf /linux | |
| parent | cc3d59199d80588a53ee353da5d69726bd093c51 (diff) | |
| download | strace-7845a42b39e59e904d01e75e21f7bc7eb6462560.tar.gz strace-7845a42b39e59e904d01e75e21f7bc7eb6462560.tar.bz2 strace-7845a42b39e59e904d01e75e21f7bc7eb6462560.tar.xz | |
Fix preadv/pwritev offset decoding
* util.c (printllval): Add align argument.
* defs.h (printllval): Update prototype.
(printllval_aligned, printllval_unaligned): New macros.
* file.c (sys_readahead, sys_truncate64, sys_ftruncate64, sys_fadvise64,
sys_fadvise64_64, sys_sync_file_range, sys_sync_file_range2,
sys_fallocate): Replace printllval call with printllval_aligned.
* io.c (sys_pread, sys_pwrite): Likewise.
(sys_preadv, sys_pwritev): Replace printllval call with
printllval_unaligned.
* linux/arm/syscallent.h: Set the number of preadv and pwritev
arguments to 5.
* linux/mips/syscallent-o32.h: Likewise.
* linux/powerpc/syscallent.h: Likewise.
* linux/sh/syscallent.h: Likewise.
* linux/xtensa/syscallent.h: Likewise.
Reported-by: Dima Kogan <dima@secretsauce.net>
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/arm/syscallent.h | 4 | ||||
| -rw-r--r-- | linux/mips/syscallent-o32.h | 8 | ||||
| -rw-r--r-- | linux/powerpc/syscallent.h | 4 | ||||
| -rw-r--r-- | linux/sh/syscallent.h | 4 | ||||
| -rw-r--r-- | linux/xtensa/syscallent.h | 4 |
5 files changed, 12 insertions, 12 deletions
diff --git a/linux/arm/syscallent.h b/linux/arm/syscallent.h index f9b2b9a..4f556f4 100644 --- a/linux/arm/syscallent.h +++ b/linux/arm/syscallent.h @@ -389,8 +389,8 @@ { 3, TD, sys_dup3, "dup3" }, /* 358 */ { 2, TD, sys_pipe2, "pipe2" }, /* 359 */ { 1, TD, sys_inotify_init1, "inotify_init1" }, /* 360 */ - { 6, TD, sys_preadv, "preadv" }, /* 361 */ - { 6, TD, sys_pwritev, "pwritev" }, /* 362 */ + { 5, TD, sys_preadv, "preadv" }, /* 361 */ + { 5, TD, sys_pwritev, "pwritev" }, /* 362 */ { 4, TP|TS, sys_rt_tgsigqueueinfo, "rt_tgsigqueueinfo"}, /* 363 */ { 5, TD, sys_perf_event_open, "perf_event_open"}, /* 364 */ { 5, TN, sys_recvmmsg, "recvmmsg" }, /* 365 */ diff --git a/linux/mips/syscallent-o32.h b/linux/mips/syscallent-o32.h index 0608f9d..859c618 100644 --- a/linux/mips/syscallent-o32.h +++ b/linux/mips/syscallent-o32.h @@ -330,8 +330,8 @@ { 3, TD, sys_dup3, "dup3" }, /* 4327 */ { 2, TD, sys_pipe2, "pipe2" }, /* 4328 */ { 1, TD, sys_inotify_init1, "inotify_init1" }, /* 4329 */ - { 6, TD, sys_preadv, "preadv" }, /* 4330 */ - { 6, TD, sys_pwritev, "pwritev" }, /* 4331 */ + { 5, TD, sys_preadv, "preadv" }, /* 4330 */ + { 5, TD, sys_pwritev, "pwritev" }, /* 4331 */ { 4, TP|TS, sys_rt_tgsigqueueinfo, "rt_tgsigqueueinfo" }, /* 4332 */ { 5, TD, sys_perf_event_open, "perf_event_open" }, /* 4333 */ { 4, TN, sys_accept4, "accept4" }, /* 4334 */ @@ -680,8 +680,8 @@ { 3, TD, printargs, "o32_dup3" }, /* 4327 */ { 2, TD, printargs, "o32_pipe2" }, /* 4328 */ { 1, TD, printargs, "o32_inotify_init1" }, /* 4329 */ - { 6, TD, printargs, "o32_preadv" }, /* 4330 */ - { 6, TD, printargs, "o32_pwritev" }, /* 4331 */ + { 5, TD, printargs, "o32_preadv" }, /* 4330 */ + { 5, TD, printargs, "o32_pwritev" }, /* 4331 */ { 4, TP|TS, printargs, "o32_rt_tgsigqueueinfo" }, /* 4332 */ { 5, TD, printargs, "o32_perf_event_open" }, /* 4333 */ { 4, TN, printargs, "o32_accept4" }, /* 4334 */ diff --git a/linux/powerpc/syscallent.h b/linux/powerpc/syscallent.h index 6f0cb7c..8a50429 100644 --- a/linux/powerpc/syscallent.h +++ b/linux/powerpc/syscallent.h @@ -346,8 +346,8 @@ { 2, TD, sys_pipe2, "pipe2" }, /* 317 */ { 1, TD, sys_inotify_init1, "inotify_init1" }, /* 318 */ { 5, TD, sys_perf_event_open, "perf_event_open" }, /* 319 */ - { 6, TD, sys_preadv, "preadv" }, /* 320 */ - { 6, TD, sys_pwritev, "pwritev" }, /* 321 */ + { 5, TD, sys_preadv, "preadv" }, /* 320 */ + { 5, TD, sys_pwritev, "pwritev" }, /* 321 */ { 4, TP|TS, sys_rt_tgsigqueueinfo, "rt_tgsigqueueinfo" }, /* 322 */ { 2, TD, sys_fanotify_init, "fanotify_init" }, /* 323 */ { 6, TD|TF, sys_fanotify_mark, "fanotify_mark" }, /* 324 */ diff --git a/linux/sh/syscallent.h b/linux/sh/syscallent.h index bd337ae..ed5812d 100644 --- a/linux/sh/syscallent.h +++ b/linux/sh/syscallent.h @@ -363,8 +363,8 @@ { 3, TD, sys_dup3, "dup3" }, /* 330 */ { 2, TD, sys_pipe2, "pipe2" }, /* 331 */ { 1, TD, sys_inotify_init1, "inotify_init1" }, /* 332 */ - { 6, TD, sys_preadv, "preadv" }, /* 333 */ - { 6, TD, sys_pwritev, "pwritev" }, /* 334 */ + { 5, TD, sys_preadv, "preadv" }, /* 333 */ + { 5, TD, sys_pwritev, "pwritev" }, /* 334 */ { 4, TP|TS, sys_rt_tgsigqueueinfo, "rt_tgsigqueueinfo"}, /* 335 */ { 5, TD, sys_perf_event_open, "perf_event_open"}, /* 336 */ { 2, TD, sys_fanotify_init, "fanotify_init" }, /* 337 */ diff --git a/linux/xtensa/syscallent.h b/linux/xtensa/syscallent.h index 62cb40d..9034961 100644 --- a/linux/xtensa/syscallent.h +++ b/linux/xtensa/syscallent.h @@ -307,8 +307,8 @@ { 2, TD, sys_timerfd_gettime, "timerfd_gettime"}, /* 314 */ { 0, 0, printargs, "SYS_315" }, /* 315 */ { 2, TD, sys_eventfd2, "eventfd2" }, /* 316 */ - { 6, TD, sys_preadv, "preadv" }, /* 317 */ - { 6, TD, sys_pwritev, "pwritev" }, /* 318 */ + { 5, TD, sys_preadv, "preadv" }, /* 317 */ + { 5, TD, sys_pwritev, "pwritev" }, /* 318 */ [319] = { }, { 2, TD, sys_fanotify_init, "fanotify_init" }, /* 320 */ { 6, TD|TF, sys_fanotify_mark, "fanotify_mark" }, /* 321 */ |