diff options
| author | Dmitry V. Levin <ldv@altlinux.org> | 2017-08-28 00:39:15 +0000 |
|---|---|---|
| committer | Dmitry V. Levin <ldv@altlinux.org> | 2017-08-28 00:39:15 +0000 |
| commit | d45d71be0607eb53a9bc39d0029a8e6ce96dbd3d (patch) | |
| tree | a9a18af61e48568c129f7c2bae421b2ac4a9eaab /nsfs.c | |
| parent | 3ca301fff889bf71a1c6b8a5116945335147640e (diff) | |
| download | strace-d45d71be0607eb53a9bc39d0029a8e6ce96dbd3d.tar.gz | |
Imply RVAL_DECODED when RVAL_IOCTL_PARSED is returned on entering
Also, rename RVAL_IOCTL_PARSED to RVAL_IOCTL_DECODED as the latter
is a more suitable name.
* defs.h (RVAL_IOCTL_PARSED): Rename to RVAL_IOCTL_DECODED.
* ioctl.c (ioctl_decode): Update comment.
(SYS_FUNC(ioctl)): Replace RVAL_IOCTL_PARSED with RVAL_IOCTL_DECODED,
add convertation of RVAL_IOCTL_DECODED to RVAL_DECODED.
* block.c (block_ioctl): Replace RVAL_DECODED | RVAL_IOCTL_PARSED
with RVAL_IOCTL_DECODED on entering. Replace RVAL_IOCTL_PARSED
with RVAL_IOCTL_DECODED on exiting.
* btrfs.c (btrfs_ioctl): Likewise.
* evdev.c: Likewise.
* file_ioctl.c: Likewise.
* fs_x_ioctl.c: Likewise.
* hdio.c: Likewise.
* loop.c: Likewise.
* mtd.c: Likewise.
* nsfs.c: Likewise.
* print_sg_req_info.c: Likewise.
* ptp.c: Likewise.
* rtc.c: Likewise.
* scsi.c: Likewise.
* sg_io_v3.c: Likewise.
* sg_io_v4.c: Likewise.
* sock.c: Likewise.
* term.c: Likewise.
* ubi.c: Likewise.
* userfaultfd.c: Likewise.
* dm.c (dm_known_ioctl): Return RVAL_IOCTL_DECODED on exiting and 0
on entering. Replace RVAL_IOCTL_PARSED with RVAL_IOCTL_DECODED
on exiting.
* v4l2.c: Likewise.
Co-authored-by: Eugene Syromyatnikov <evgsyr@gmail.com>
Diffstat (limited to 'nsfs.c')
| -rw-r--r-- | nsfs.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -37,7 +37,7 @@ nsfs_ioctl(struct tcb *tcp, unsigned int code, kernel_ulong_t arg) switch (code) { case NS_GET_USERNS: case NS_GET_PARENT: - return RVAL_IOCTL_PARSED | RVAL_FD | RVAL_DECODED; + return RVAL_IOCTL_DECODED | RVAL_FD; case NS_GET_NSTYPE: if (entering(tcp)) return 0; @@ -46,10 +46,10 @@ nsfs_ioctl(struct tcb *tcp, unsigned int code, kernel_ulong_t arg) outstr = xlookup(setns_types, tcp->u_rval); if (outstr) { tcp->auxstr = outstr; - return RVAL_IOCTL_PARSED | RVAL_STR; + return RVAL_IOCTL_DECODED | RVAL_STR; } } - return RVAL_IOCTL_PARSED; + return RVAL_IOCTL_DECODED; case NS_GET_OWNER_UID: if (entering(tcp)) return 0; @@ -58,7 +58,7 @@ nsfs_ioctl(struct tcb *tcp, unsigned int code, kernel_ulong_t arg) printuid("[", uid); tprints("]"); } - return RVAL_IOCTL_PARSED; + return RVAL_IOCTL_DECODED; default: return RVAL_DECODED; } |