From: Mike Frysinger Date: Mon, 19 Aug 2013 05:00:39 +0000 (-0400) Subject: fanotify_mark: fix number of args for 32bit arches X-Git-Tag: v4.9~183 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9e937d9c471a7e365d621d11d4fa06c8f4b02454;p=strace fanotify_mark: fix number of args for 32bit arches The fanotify_mark func takes a 64bit mask, so 32bit arches have to split it up into two fields. When the syscall was added, it was listed as only having 5 fields total (since that's correct for 64bit systems). * linux/arm/syscallent.h: Set the number of fanotify_mark arguments to 6. * linux/bfin/syscallent.h: Likewise. * linux/hppa/syscallent.h: Likewise. * linux/i386/syscallent.h: Likewise. * linux/m68k/syscallent.h: Likewise. * linux/metag/syscallent.h: Likewise. * linux/microblaze/syscallent.h: Likewise. * linux/mips/syscallent-o32.h: Likewise. * linux/or1k/syscallent.h: Likewise. * linux/powerpc/syscallent.h: Likewise. * linux/s390/syscallent.h: Likewise. * linux/sh/syscallent.h: Likewise. * linux/sparc/syscallent.h: Likewise. * linux/tile/syscallent1.h: Likewise. Signed-off-by: Mike Frysinger Acked-by: Chris Metcalf [for tile] --- diff --git a/linux/arm/syscallent.h b/linux/arm/syscallent.h index 132b22ad..f9b2b9a9 100644 --- a/linux/arm/syscallent.h +++ b/linux/arm/syscallent.h @@ -396,7 +396,7 @@ { 5, TN, sys_recvmmsg, "recvmmsg" }, /* 365 */ { 4, TN, sys_accept4, "accept4" }, /* 366 */ { 2, TD, sys_fanotify_init, "fanotify_init" }, /* 367 */ - { 5, TD|TF, sys_fanotify_mark, "fanotify_mark" }, /* 368 */ + { 6, TD|TF, sys_fanotify_mark, "fanotify_mark" }, /* 368 */ { 4, 0, sys_prlimit64, "prlimit64" }, /* 369 */ { 5, TD|TF, sys_name_to_handle_at, "name_to_handle_at"}, /* 370 */ { 3, TD, sys_open_by_handle_at, "open_by_handle_at"}, /* 371 */ diff --git a/linux/bfin/syscallent.h b/linux/bfin/syscallent.h index cc03eaf0..64db1a91 100644 --- a/linux/bfin/syscallent.h +++ b/linux/bfin/syscallent.h @@ -398,7 +398,7 @@ { 5, TD, sys_perf_event_open, "perf_event_open" }, /* 369 */ { 5, TN, sys_recvmmsg, "recvmmsg" }, /* 370 */ { 2, TD, sys_fanotify_init, "fanotify_init" }, /* 371 */ - { 5, TD|TF, sys_fanotify_mark, "fanotify_mark" }, /* 372 */ + { 6, TD|TF, sys_fanotify_mark, "fanotify_mark" }, /* 372 */ { 4, 0, sys_prlimit64, "prlimit64" }, /* 373 */ { 3, 0, sys_cacheflush, "cacheflush" }, /* 374 */ { 5, TD|TF, sys_name_to_handle_at, "name_to_handle_at" }, /* 375 */ diff --git a/linux/hppa/syscallent.h b/linux/hppa/syscallent.h index 4ce2dc20..21e4ae72 100644 --- a/linux/hppa/syscallent.h +++ b/linux/hppa/syscallent.h @@ -325,7 +325,7 @@ { 4, TN, sys_accept4, "accept4" }, /* 320 */ { 4, 0, sys_prlimit64, "prlimit64" }, /* 321 */ { 2, TD, sys_fanotify_init, "fanotify_init" }, /* 322 */ - { 5, TD|TF, sys_fanotify_mark, "fanotify_mark" }, /* 323 */ + { 6, TD|TF, sys_fanotify_mark, "fanotify_mark" }, /* 323 */ { 2, 0, sys_clock_adjtime, "clock_adjtime" }, /* 324 */ { 5, TD|TF, sys_name_to_handle_at, "name_to_handle_at" }, /* 325 */ { 3, TD, sys_open_by_handle_at, "open_by_handle_at" }, /* 326 */ diff --git a/linux/i386/syscallent.h b/linux/i386/syscallent.h index 480a28e6..1f759e47 100644 --- a/linux/i386/syscallent.h +++ b/linux/i386/syscallent.h @@ -367,7 +367,7 @@ { 5, TD, sys_perf_event_open, "perf_event_open"}, /* 336 */ { 5, TN, sys_recvmmsg, "recvmmsg" }, /* 337 */ { 2, TD, sys_fanotify_init, "fanotify_init" }, /* 338 */ - { 5, TD|TF, sys_fanotify_mark, "fanotify_mark" }, /* 339 */ + { 6, TD|TF, sys_fanotify_mark, "fanotify_mark" }, /* 339 */ { 4, 0, sys_prlimit64, "prlimit64" }, /* 340 */ { 5, TD|TF, sys_name_to_handle_at, "name_to_handle_at"}, /* 341 */ { 3, TD, sys_open_by_handle_at, "open_by_handle_at"}, /* 342 */ diff --git a/linux/m68k/syscallent.h b/linux/m68k/syscallent.h index d3eec794..adf9f5b9 100644 --- a/linux/m68k/syscallent.h +++ b/linux/m68k/syscallent.h @@ -364,7 +364,7 @@ { 6, 0, printargs, "atomic_comxchg_32"}, /* 335 */ { 0, 0, printargs, "atomic_barrier"}, /* 336 */ { 2, TD, sys_fanotify_init, "fanotify_init" }, /* 337 */ - { 5, TD|TF, sys_fanotify_mark, "fanotify_mark" }, /* 338 */ + { 6, TD|TF, sys_fanotify_mark, "fanotify_mark" }, /* 338 */ { 4, 0, sys_prlimit64, "prlimit64" }, /* 339 */ { 5, TD|TF, sys_name_to_handle_at, "name_to_handle_at"}, /* 340 */ { 3, TD, sys_open_by_handle_at, "open_by_handle_at"}, /* 341 */ diff --git a/linux/metag/syscallent.h b/linux/metag/syscallent.h index 9401ca46..6216ac63 100644 --- a/linux/metag/syscallent.h +++ b/linux/metag/syscallent.h @@ -253,7 +253,7 @@ { 4, TP, sys_wait4, "wait4" }, /* 260 */ { 4, 0, sys_prlimit64, "prlimit64" }, /* 261 */ { 2, TD, sys_fanotify_init, "fanotify_init" }, /* 262 */ - { 5, TD|TF, sys_fanotify_mark, "fanotify_mark" }, /* 263 */ + { 6, TD|TF, sys_fanotify_mark, "fanotify_mark" }, /* 263 */ { 5, TD|TF, sys_name_to_handle_at, "name_to_handle_at" }, /* 264 */ { 3, TD, sys_open_by_handle_at, "open_by_handle_at" }, /* 265 */ { 2, 0, sys_clock_adjtime, "clock_adjtime" }, /* 266 */ diff --git a/linux/microblaze/syscallent.h b/linux/microblaze/syscallent.h index 22b69c48..38f8bba8 100644 --- a/linux/microblaze/syscallent.h +++ b/linux/microblaze/syscallent.h @@ -395,7 +395,7 @@ { 5, TD, sys_perf_event_open, "perf_event_open" }, /* 366 */ { 5, TN, printargs, "recvmmsg" }, /* 367 */ { 2, TD, sys_fanotify_init, "fanotify_init" }, /* 368 */ - { 5, TD|TF, sys_fanotify_mark, "fanotify_mark" }, /* 369 */ + { 6, TD|TF, sys_fanotify_mark, "fanotify_mark" }, /* 369 */ { 4, 0, sys_prlimit64, "prlimit64" }, /* 370 */ { 5, TD|TF, sys_name_to_handle_at, "name_to_handle_at"}, /* 371 */ { 3, TD, sys_open_by_handle_at, "open_by_handle_at"}, /* 372 */ diff --git a/linux/mips/syscallent-o32.h b/linux/mips/syscallent-o32.h index c23ac146..3431b814 100644 --- a/linux/mips/syscallent-o32.h +++ b/linux/mips/syscallent-o32.h @@ -337,7 +337,7 @@ { 4, TN, sys_accept4, "accept4" }, /* 4334 */ { 5, TN, sys_recvmmsg, "recvmmsg" }, /* 4335 */ { 2, TD, sys_fanotify_init, "fanotify_init" }, /* 4336 */ - { 5, TD|TF, sys_fanotify_mark, "fanotify_mark" }, /* 4337 */ + { 6, TD|TF, sys_fanotify_mark, "fanotify_mark" }, /* 4337 */ { 4, 0, sys_prlimit64, "prlimit64" }, /* 4338 */ { 5, TD|TF, sys_name_to_handle_at, "name_to_handle_at"}, /* 4339 */ { 3, TD, sys_open_by_handle_at, "open_by_handle_at"}, /* 4340 */ @@ -687,7 +687,7 @@ { 4, TN, printargs, "o32_accept4" }, /* 4334 */ { 5, TN, printargs, "o32_recvmmsg" }, /* 4335 */ { 2, TD, printargs, "o32_fanotify_init" }, /* 4336 */ - { 5, TD|TF, printargs, "o32_fanotify_mark" }, /* 4337 */ + { 6, TD|TF, printargs, "o32_fanotify_mark" }, /* 4337 */ { 4, 0, printargs, "o32_prlimit64" }, /* 4338 */ { 5, TD|TF, printargs, "o32_name_to_handle_at"}, /* 4339 */ { 3, TD, printargs, "o32_open_by_handle_at"}, /* 4340 */ diff --git a/linux/or1k/syscallent.h b/linux/or1k/syscallent.h index d1122126..a45c52f3 100644 --- a/linux/or1k/syscallent.h +++ b/linux/or1k/syscallent.h @@ -249,7 +249,7 @@ { 4, TP, sys_wait4, "wait4" }, /* 260 */ { 4, 0, sys_prlimit64, "prlimit64" }, /* 261 */ { 2, TD, sys_fanotify_init, "fanotify_init" }, /* 262 */ - { 5, TD|TF, sys_fanotify_mark, "fanotify_mark" }, /* 263 */ + { 6, TD|TF, sys_fanotify_mark, "fanotify_mark" }, /* 263 */ { 5, TD|TF, sys_name_to_handle_at, "name_to_handle_at" }, /* 264 */ { 3, TD, sys_open_by_handle_at, "open_by_handle_at" }, /* 265 */ { 2, 0, sys_clock_adjtime, "clock_adjtime" }, /* 266 */ diff --git a/linux/powerpc/syscallent.h b/linux/powerpc/syscallent.h index d84a8f48..6f0cb7c5 100644 --- a/linux/powerpc/syscallent.h +++ b/linux/powerpc/syscallent.h @@ -350,7 +350,7 @@ { 6, TD, sys_pwritev, "pwritev" }, /* 321 */ { 4, TP|TS, sys_rt_tgsigqueueinfo, "rt_tgsigqueueinfo" }, /* 322 */ { 2, TD, sys_fanotify_init, "fanotify_init" }, /* 323 */ - { 5, TD|TF, sys_fanotify_mark, "fanotify_mark" }, /* 324 */ + { 6, TD|TF, sys_fanotify_mark, "fanotify_mark" }, /* 324 */ { 4, 0, sys_prlimit64, "prlimit64" }, /* 325 */ { 3, TN, sys_socket, "socket" }, /* 326 */ { 3, TN, sys_bind, "bind" }, /* 327 */ diff --git a/linux/s390/syscallent.h b/linux/s390/syscallent.h index 719029f4..2a0bc21d 100644 --- a/linux/s390/syscallent.h +++ b/linux/s390/syscallent.h @@ -361,7 +361,7 @@ { 4, TP|TS, sys_rt_tgsigqueueinfo, "rt_tgsigqueueinfo"}, /* 330 */ { 5, TD, sys_perf_event_open, "perf_event_open"}, /* 331 */ { 2, TD, sys_fanotify_init, "fanotify_init" }, /* 332 */ - { 5, TD|TF, sys_fanotify_mark, "fanotify_mark" }, /* 333 */ + { 6, TD|TF, sys_fanotify_mark, "fanotify_mark" }, /* 333 */ { 4, 0, sys_prlimit64, "prlimit64" }, /* 334 */ { 5, TD|TF, sys_name_to_handle_at, "name_to_handle_at"}, /* 335 */ { 3, TD, sys_open_by_handle_at, "open_by_handle_at"}, /* 336 */ diff --git a/linux/sh/syscallent.h b/linux/sh/syscallent.h index b51fc6ff..bd337aee 100644 --- a/linux/sh/syscallent.h +++ b/linux/sh/syscallent.h @@ -368,7 +368,7 @@ { 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 */ - { 5, TD|TF, sys_fanotify_mark, "fanotify_mark" }, /* 338 */ + { 6, TD|TF, sys_fanotify_mark, "fanotify_mark" }, /* 338 */ { 4, 0, sys_prlimit64, "prlimit64" }, /* 339 */ { 3, TN, sys_socket, "socket" }, /* 340 */ { 3, TN, sys_bind, "bind" }, /* 341 */ diff --git a/linux/sparc/syscallent.h b/linux/sparc/syscallent.h index 804e8c36..d5df8e15 100644 --- a/linux/sparc/syscallent.h +++ b/linux/sparc/syscallent.h @@ -328,7 +328,7 @@ { 5, TD, sys_perf_event_open, "perf_event_open"}, /* 327 */ { 5, TN, sys_recvmmsg, "recvmmsg" }, /* 328 */ { 2, TD, sys_fanotify_init, "fanotify_init" }, /* 329 */ - { 5, TD|TF, sys_fanotify_mark, "fanotify_mark" }, /* 330 */ + { 6, TD|TF, sys_fanotify_mark, "fanotify_mark" }, /* 330 */ { 4, 0, sys_prlimit64, "prlimit64" }, /* 331 */ { 5, TD|TF, sys_name_to_handle_at, "name_to_handle_at"}, /* 332 */ { 3, TD, sys_open_by_handle_at, "open_by_handle_at"}, /* 333 */ diff --git a/linux/tile/syscallent1.h b/linux/tile/syscallent1.h index 9f205218..94b7737d 100644 --- a/linux/tile/syscallent1.h +++ b/linux/tile/syscallent1.h @@ -265,7 +265,7 @@ { 4, TP, sys_wait4, "wait4" }, /* 260 */ { 4, 0, sys_prlimit64, "prlimit64" }, /* 261 */ { 2, TD, sys_fanotify_init, "fanotify_init" }, /* 262 */ - { 5, TD|TF, sys_fanotify_mark, "fanotify_mark" }, /* 263 */ + { 6, TD|TF, sys_fanotify_mark, "fanotify_mark" }, /* 263 */ { 5, TD|TF, sys_name_to_handle_at, "name_to_handle_at" }, /* 264 */ { 3, TD, sys_open_by_handle_at, "open_by_handle_at" }, /* 265 */ { 2, 0, sys_clock_adjtime, "clock_adjtime" }, /* 266 */