Skip to content

Commit 4fc3cdd

Browse files
bozutafvivier
bozutaf
authored and
vivier
committed
linux-user: Add strace support for printing argument of syscalls used for extended attributes
This patch implements strace argument printing functionality for following syscalls: *getxattr, lgetxattr, fgetxattr - retrieve an extended attribute value ssize_t getxattr(const char *path, const char *name, void *value, size_t size) ssize_t lgetxattr(const char *path, const char *name, void *value, size_t size) ssize_t fgetxattr(int fd, const char *name, void *value, size_t size) man page: https://www.man7.org/linux/man-pages/man2/getxattr.2.html *listxattr, llistxattr, flistxattr - list extended attribute names ssize_t listxattr(const char *path, char *list, size_t size) ssize_t llistxattr(const char *path, char *list, size_t size) ssize_t flistxattr(int fd, char *list, size_t size) man page: https://www.man7.org/linux/man-pages/man2/listxattr.2.html *removexattr, lremovexattr, fremovexattr - remove an extended attribute int removexattr(const char *path, const char *name) int lremovexattr(const char *path, const char *name) int fremovexattr(int fd, const char *name) man page: https://www.man7.org/linux/man-pages/man2/removexattr.2.html Implementation notes: All of the syscalls have strings as argument types and thus a separate printing function was stated in file "strace.list" for every one of them. All of these printing functions were defined in "strace.c" using existing printing functions for appropriate argument types: "print_string()" - for (const char*) type "print_pointer()" - for (char*) and (void *) type "print_raw_param()" for (int) and (size_t) type Syscalls "getxattr()" and "lgetxattr()" have the same number and type of arguments and thus their print functions ("print_getxattr", "print_lgetxattr") share a same definition. The same statement applies to syscalls "listxattr()" and "llistxattr()". Function "print_syscall_ret_listxattr()" was added to print the returned list of extended attributes for syscalls "print_listxattr(), print_llistxattr() and print_flistxattr()". Signed-off-by: Filip Bozuta <[email protected]> Reviewed-by: Laurent Vivier <[email protected]> Message-Id: <[email protected]> Signed-off-by: Laurent Vivier <[email protected]>
1 parent c42569f commit 4fc3cdd

File tree

2 files changed

+133
-9
lines changed

2 files changed

+133
-9
lines changed

‎linux-user/strace.c‎

Lines changed: 121 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -826,6 +826,40 @@ print_syscall_ret_adjtimex(const struct syscallname *name, abi_long ret,
826826
}
827827
#endif
828828

829+
#if defined(TARGET_NR_listxattr) || defined(TARGET_NR_llistxattr) \
830+
|| defined(TARGGET_NR_flistxattr)
831+
static void
832+
print_syscall_ret_listxattr(const struct syscallname *name, abi_long ret,
833+
abi_long arg0, abi_long arg1, abi_long arg2,
834+
abi_long arg3, abi_long arg4, abi_long arg5)
835+
{
836+
print_syscall_err(ret);
837+
838+
if (ret >= 0) {
839+
qemu_log(TARGET_ABI_FMT_ld, ret);
840+
qemu_log(" (list = ");
841+
if (arg1 != 0) {
842+
abi_long attr = arg1;
843+
while (ret) {
844+
if (attr != arg1) {
845+
qemu_log(",");
846+
}
847+
print_string(attr, 1);
848+
ret -= target_strlen(attr) + 1;
849+
attr += target_strlen(attr) + 1;
850+
}
851+
} else {
852+
qemu_log("NULL");
853+
}
854+
qemu_log(")");
855+
}
856+
857+
qemu_log("\n");
858+
}
859+
#define print_syscall_ret_llistxattr print_syscall_ret_listxattr
860+
#define print_syscall_ret_flistxattr print_syscall_ret_listxattr
861+
#endif
862+
829863
UNUSED static struct flags access_flags[] = {
830864
FLAG_GENERIC(F_OK),
831865
FLAG_GENERIC(R_OK),
@@ -1633,6 +1667,93 @@ print_fcntl(const struct syscallname *name,
16331667
#define print_fcntl64 print_fcntl
16341668
#endif
16351669

1670+
#ifdef TARGET_NR_fgetxattr
1671+
static void
1672+
print_fgetxattr(const struct syscallname *name,
1673+
abi_long arg0, abi_long arg1, abi_long arg2,
1674+
abi_long arg3, abi_long arg4, abi_long arg5)
1675+
{
1676+
print_syscall_prologue(name);
1677+
print_raw_param("%d", arg0, 0);
1678+
print_string(arg1, 0);
1679+
print_pointer(arg2, 0);
1680+
print_raw_param(TARGET_FMT_lu, arg3, 1);
1681+
print_syscall_epilogue(name);
1682+
}
1683+
#endif
1684+
1685+
#ifdef TARGET_NR_flistxattr
1686+
static void
1687+
print_flistxattr(const struct syscallname *name,
1688+
abi_long arg0, abi_long arg1, abi_long arg2,
1689+
abi_long arg3, abi_long arg4, abi_long arg5)
1690+
{
1691+
print_syscall_prologue(name);
1692+
print_raw_param("%d", arg0, 0);
1693+
print_pointer(arg1, 0);
1694+
print_raw_param(TARGET_FMT_lu, arg2, 1);
1695+
print_syscall_epilogue(name);
1696+
}
1697+
#endif
1698+
1699+
#if defined(TARGET_NR_getxattr) || defined(TARGET_NR_lgetxattr)
1700+
static void
1701+
print_getxattr(const struct syscallname *name,
1702+
abi_long arg0, abi_long arg1, abi_long arg2,
1703+
abi_long arg3, abi_long arg4, abi_long arg5)
1704+
{
1705+
print_syscall_prologue(name);
1706+
print_string(arg0, 0);
1707+
print_string(arg1, 0);
1708+
print_pointer(arg2, 0);
1709+
print_raw_param(TARGET_FMT_lu, arg3, 1);
1710+
print_syscall_epilogue(name);
1711+
}
1712+
#define print_lgetxattr print_getxattr
1713+
#endif
1714+
1715+
#if defined(TARGET_NR_listxattr) || defined(TARGET_NR_llistxattr)
1716+
static void
1717+
print_listxattr(const struct syscallname *name,
1718+
abi_long arg0, abi_long arg1, abi_long arg2,
1719+
abi_long arg3, abi_long arg4, abi_long arg5)
1720+
{
1721+
print_syscall_prologue(name);
1722+
print_string(arg0, 0);
1723+
print_pointer(arg1, 0);
1724+
print_raw_param(TARGET_FMT_lu, arg2, 1);
1725+
print_syscall_epilogue(name);
1726+
}
1727+
#define print_llistxattr print_listxattr
1728+
#endif
1729+
1730+
#if defined(TARGET_NR_fremovexattr)
1731+
static void
1732+
print_fremovexattr(const struct syscallname *name,
1733+
abi_long arg0, abi_long arg1, abi_long arg2,
1734+
abi_long arg3, abi_long arg4, abi_long arg5)
1735+
{
1736+
print_syscall_prologue(name);
1737+
print_raw_param("%d", arg0, 0);
1738+
print_string(arg1, 1);
1739+
print_syscall_epilogue(name);
1740+
}
1741+
#endif
1742+
1743+
#if defined(TARGET_NR_removexattr) || defined(TARGET_NR_lremovexattr)
1744+
static void
1745+
print_removexattr(const struct syscallname *name,
1746+
abi_long arg0, abi_long arg1, abi_long arg2,
1747+
abi_long arg3, abi_long arg4, abi_long arg5)
1748+
{
1749+
print_syscall_prologue(name);
1750+
print_string(arg0, 0);
1751+
print_string(arg1, 1);
1752+
print_syscall_epilogue(name);
1753+
}
1754+
#define print_lremovexattr print_removexattr
1755+
#endif
1756+
16361757
#ifdef TARGET_NR_futimesat
16371758
static void
16381759
print_futimesat(const struct syscallname *name,

‎linux-user/strace.list‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -218,13 +218,14 @@
218218
{ TARGET_NR_fdatasync, "fdatasync" , "%s(%d)", NULL, NULL },
219219
#endif
220220
#ifdef TARGET_NR_fgetxattr
221-
{ TARGET_NR_fgetxattr, "fgetxattr" , NULL, NULL, NULL },
221+
{ TARGET_NR_fgetxattr, "fgetxattr" , NULL, print_fgetxattr, NULL },
222222
#endif
223223
#ifdef TARGET_NR_finit_module
224224
{ TARGET_NR_finit_module, "finit_module" , NULL, NULL, NULL },
225225
#endif
226226
#ifdef TARGET_NR_flistxattr
227-
{ TARGET_NR_flistxattr, "flistxattr" , NULL, NULL, NULL },
227+
{ TARGET_NR_flistxattr, "flistxattr" , NULL, print_flistxattr,
228+
print_syscall_ret_flistxattr},
228229
#endif
229230
#ifdef TARGET_NR_flock
230231
{ TARGET_NR_flock, "flock" , NULL, NULL, NULL },
@@ -233,7 +234,7 @@
233234
{ TARGET_NR_fork, "fork" , "%s()", NULL, NULL },
234235
#endif
235236
#ifdef TARGET_NR_fremovexattr
236-
{ TARGET_NR_fremovexattr, "fremovexattr" , NULL, NULL, NULL },
237+
{ TARGET_NR_fremovexattr, "fremovexattr" , NULL, print_fremovexattr, NULL },
237238
#endif
238239
#ifdef TARGET_NR_fsetxattr
239240
{ TARGET_NR_fsetxattr, "fsetxattr" , NULL, NULL, NULL },
@@ -396,7 +397,7 @@
396397
{ TARGET_NR_getuid32, "getuid32" , NULL, NULL, NULL },
397398
#endif
398399
#ifdef TARGET_NR_getxattr
399-
{ TARGET_NR_getxattr, "getxattr" , NULL, NULL, NULL },
400+
{ TARGET_NR_getxattr, "getxattr" , NULL, print_getxattr, NULL },
400401
#endif
401402
#ifdef TARGET_NR_getxgid
402403
{ TARGET_NR_getxgid, "getxgid" , NULL, NULL, NULL },
@@ -480,7 +481,7 @@
480481
{ TARGET_NR_lchown32, "lchown32" , NULL, NULL, NULL },
481482
#endif
482483
#ifdef TARGET_NR_lgetxattr
483-
{ TARGET_NR_lgetxattr, "lgetxattr" , NULL, NULL, NULL },
484+
{ TARGET_NR_lgetxattr, "lgetxattr" , NULL, print_lgetxattr, NULL },
484485
#endif
485486
#ifdef TARGET_NR_link
486487
{ TARGET_NR_link, "link" , NULL, print_link, NULL },
@@ -495,10 +496,12 @@
495496
{ TARGET_NR_listen, "listen" , "%s(%d,%d)", NULL, NULL },
496497
#endif
497498
#ifdef TARGET_NR_listxattr
498-
{ TARGET_NR_listxattr, "listxattr" , NULL, NULL, NULL },
499+
{ TARGET_NR_listxattr, "listxattr" , NULL, print_listxattr,
500+
print_syscall_ret_listxattr},
499501
#endif
500502
#ifdef TARGET_NR_llistxattr
501-
{ TARGET_NR_llistxattr, "llistxattr" , NULL, NULL, NULL },
503+
{ TARGET_NR_llistxattr, "llistxattr" , NULL, print_llistxattr,
504+
print_syscall_ret_llistxattr},
502505
#endif
503506
#ifdef TARGET_NR__llseek
504507
{ TARGET_NR__llseek, "_llseek" , NULL, print__llseek, NULL },
@@ -510,7 +513,7 @@
510513
{ TARGET_NR_lookup_dcookie, "lookup_dcookie" , NULL, NULL, NULL },
511514
#endif
512515
#ifdef TARGET_NR_lremovexattr
513-
{ TARGET_NR_lremovexattr, "lremovexattr" , NULL, NULL, NULL },
516+
{ TARGET_NR_lremovexattr, "lremovexattr" , NULL, print_lremovexattr, NULL },
514517
#endif
515518
#ifdef TARGET_NR_lseek
516519
{ TARGET_NR_lseek, "lseek" , NULL, NULL, NULL },
@@ -1116,7 +1119,7 @@
11161119
{ TARGET_NR_remap_file_pages, "remap_file_pages" , NULL, NULL, NULL },
11171120
#endif
11181121
#ifdef TARGET_NR_removexattr
1119-
{ TARGET_NR_removexattr, "removexattr" , NULL, NULL, NULL },
1122+
{ TARGET_NR_removexattr, "removexattr" , NULL, print_removexattr, NULL },
11201123
#endif
11211124
#ifdef TARGET_NR_rename
11221125
{ TARGET_NR_rename, "rename" , NULL, print_rename, NULL },

0 commit comments

Comments
 (0)