From: Eugene Syromyatnikov <evgsyr-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
To: strace-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org
Cc: dm-devel-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org,
mpatocka-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org
Subject: [PATCH 11/21] dm: Compare entering field values with exiting ones
Date: Sun, 9 Oct 2016 16:30:33 +0300 [thread overview]
Message-ID: <20161009133033.GA3547@obsidian> (raw)
In-Reply-To: <20161005.192828.566127461630656590.yamato-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
---
dm.c | 74 ++++++++++++++++++++++++++++++++++++++++--------------
tests/ioctl_dm.c | 26 +++++++------------
2 files changed, 64 insertions(+), 36 deletions(-)
diff --git a/dm.c b/dm.c
index f23a65d..b6fb11d 100644
--- a/dm.c
+++ b/dm.c
@@ -282,28 +282,62 @@ dm_decode_string(const struct dm_ioctl *ioc, const char *extra,
static int
dm_known_ioctl(struct tcb *tcp, const unsigned int code, long arg)
{
- struct dm_ioctl ioc;
+ struct dm_ioctl *ioc;
+ struct dm_ioctl *entering_ioc = NULL;
+ bool ioc_changed = false;
char *extra = NULL;
uint32_t extra_size = 0;
- if (umoven(tcp, arg, sizeof(ioc) - sizeof(ioc.data), &ioc) < 0)
+ ioc = malloc(sizeof(* ioc));
+ if (!ioc)
return 0;
+
+ if (umoven(tcp, arg, sizeof(*ioc) - sizeof(ioc->data), ioc) < 0) {
+ free(ioc);
+ return 0;
+ }
+ if (entering(tcp))
+ set_tcb_priv_data(tcp, ioc, free);
+ else {
+ entering_ioc = get_tcb_priv_data(tcp);
+
+ /*
+ * retrieve_status, __dev_status called only in case of success,
+ * so it looks like there's no need to check open_count,
+ * event_nr, target_count, dev fields for change (they are
+ * printed only in case of absence of errors).
+ */
+ if (!entering_ioc ||
+ (ioc->version[0] != entering_ioc->version[0]) ||
+ (ioc->version[1] != entering_ioc->version[1]) ||
+ (ioc->version[2] != entering_ioc->version[2]) ||
+ (ioc->data_size != entering_ioc->data_size) ||
+ (ioc->data_start != entering_ioc->data_start) ||
+ (ioc->flags != entering_ioc->flags))
+ ioc_changed = true;
+ }
+
+ if (exiting(tcp) && syserror(tcp) && !ioc_changed) {
+ free(ioc);
+ return 1;
+ }
+
tprintf("%s{version=%d.%d.%d", entering(tcp) ? ", " : " => ",
- ioc.version[0], ioc.version[1], ioc.version[2]);
+ ioc->version[0], ioc->version[1], ioc->version[2]);
/*
* if we use a different version of ABI, do not attempt to decode
* ioctl fields
*/
- if (ioc.version[0] != DM_VERSION_MAJOR) {
+ if (ioc->version[0] != DM_VERSION_MAJOR) {
tprints(", /* Unsupported device mapper ABI version */ ...");
goto skip;
}
- if (ioc.data_size > sizeof(ioc)) {
- extra = malloc(ioc.data_size);
+ if (ioc->data_size > sizeof(ioc)) {
+ extra = malloc(ioc->data_size);
if (extra) {
- extra_size = ioc.data_size;
+ extra_size = ioc->data_size;
if (umoven(tcp, arg, extra_size, extra) < 0) {
free(extra);
extra = NULL;
@@ -311,9 +345,9 @@ dm_known_ioctl(struct tcb *tcp, const unsigned int code, long arg)
}
}
}
- dm_decode_device(code, &ioc);
- dm_decode_values(tcp, code, &ioc);
- dm_decode_flags(&ioc);
+ dm_decode_device(code, ioc);
+ dm_decode_values(tcp, code, ioc);
+ dm_decode_flags(ioc);
if (abbrev(tcp))
tprints(", ...");
else
@@ -322,42 +356,42 @@ dm_known_ioctl(struct tcb *tcp, const unsigned int code, long arg)
case DM_TABLE_STATUS:
if (entering(tcp) || syserror(tcp))
break;
- dm_decode_dm_target_spec(tcp, &ioc, extra, extra_size);
+ dm_decode_dm_target_spec(tcp, ioc, extra, extra_size);
break;
case DM_TABLE_LOAD:
if (!entering(tcp))
break;
- dm_decode_dm_target_spec(tcp, &ioc, extra, extra_size);
+ dm_decode_dm_target_spec(tcp, ioc, extra, extra_size);
break;
case DM_TABLE_DEPS:
if (entering(tcp) || syserror(tcp))
break;
- dm_decode_dm_target_deps(&ioc, extra, extra_size);
+ dm_decode_dm_target_deps(ioc, extra, extra_size);
break;
case DM_LIST_DEVICES:
if (entering(tcp) || syserror(tcp))
break;
- dm_decode_dm_name_list(&ioc, extra, extra_size);
+ dm_decode_dm_name_list(ioc, extra, extra_size);
break;
case DM_LIST_VERSIONS:
if (entering(tcp) || syserror(tcp))
break;
- dm_decode_dm_target_versions(&ioc, extra, extra_size);
+ dm_decode_dm_target_versions(ioc, extra, extra_size);
break;
case DM_TARGET_MSG:
if (entering(tcp)) {
- dm_decode_dm_target_msg(&ioc, extra,
+ dm_decode_dm_target_msg(ioc, extra,
extra_size);
} else if (!syserror(tcp) &&
- ioc.flags & DM_DATA_OUT_FLAG) {
- dm_decode_string(&ioc, extra, extra_size);
+ ioc->flags & DM_DATA_OUT_FLAG) {
+ dm_decode_string(ioc, extra, extra_size);
}
break;
case DM_DEV_RENAME:
case DM_DEV_SET_GEOMETRY:
if (!entering(tcp))
break;
- dm_decode_string(&ioc, extra, extra_size);
+ dm_decode_string(ioc, extra, extra_size);
break;
}
@@ -365,6 +399,8 @@ dm_known_ioctl(struct tcb *tcp, const unsigned int code, long arg)
tprints("}");
if (extra)
free(extra);
+ if (exiting(tcp))
+ free(ioc);
return 1;
}
diff --git a/tests/ioctl_dm.c b/tests/ioctl_dm.c
index 3c43913..31f474c 100644
--- a/tests/ioctl_dm.c
+++ b/tests/ioctl_dm.c
@@ -42,8 +42,6 @@ main(void)
ioctl(-1, DM_VERSION, &s);
printf("ioctl(-1, DM_VERSION, "
"{version=4.1.2, dev=makedev(18, 52), name=\"nnn\", "
- "uuid=\"uuu\", flags=0} => "
- "{version=4.1.2, dev=makedev(18, 52), name=\"nnn\", "
"uuid=\"uuu\", flags=0}) = -1 EBADF (%m)\n");
init_s();
@@ -58,9 +56,8 @@ main(void)
printf("ioctl(-1, DM_TABLE_LOAD, "
"{version=4.1.2, dev=makedev(18, 52), name=\"nnn\", "
"uuid=\"uuu\", target_count=1, flags=0, {sector_start=16, "
- "length=32, target_type=\"tgt\", string=\"tparams\"}} => "
- "{version=4.1.2, dev=makedev(18, 52), name=\"nnn\", "
- "uuid=\"uuu\", flags=0}) = -1 EBADF (%m)\n");
+ "length=32, target_type=\"tgt\", string=\"tparams\"}}) = "
+ "-1 EBADF (%m)\n");
init_s();
s.u.tm.target_msg.sector = 0x1234;
@@ -69,27 +66,24 @@ main(void)
ioctl(-1, DM_TARGET_MSG, &s);
printf("ioctl(-1, DM_TARGET_MSG, "
"{version=4.1.2, dev=makedev(18, 52), name=\"nnn\", "
- "uuid=\"uuu\", flags=0, {sector=4660, message=\"tmsg\"}} => "
- "{version=4.1.2, dev=makedev(18, 52), name=\"nnn\", "
- "uuid=\"uuu\", flags=0}) = -1 EBADF (%m)\n");
+ "uuid=\"uuu\", flags=0, {sector=4660, message=\"tmsg\"}}) = "
+ "-1 EBADF (%m)\n");
init_s();
strcpy(s.u.string, "10 20 30 40");
ioctl(-1, DM_DEV_SET_GEOMETRY, &s);
printf("ioctl(-1, DM_DEV_SET_GEOMETRY, "
"{version=4.1.2, dev=makedev(18, 52), name=\"nnn\", "
- "uuid=\"uuu\", flags=0, string=\"10 20 30 40\"} => "
- "{version=4.1.2, dev=makedev(18, 52), name=\"nnn\", "
- "uuid=\"uuu\", flags=0}) = -1 EBADF (%m)\n");
+ "uuid=\"uuu\", flags=0, string=\"10 20 30 40\"}) = "
+ "-1 EBADF (%m)\n");
init_s();
strcpy(s.u.string, "new-name");
ioctl(-1, DM_DEV_RENAME, &s);
printf("ioctl(-1, DM_DEV_RENAME, "
"{version=4.1.2, dev=makedev(18, 52), name=\"nnn\", "
- "uuid=\"uuu\", event_nr=0, flags=0, string=\"new-name\"} => "
- "{version=4.1.2, dev=makedev(18, 52), name=\"nnn\", "
- "uuid=\"uuu\", flags=0}) = -1 EBADF (%m)\n");
+ "uuid=\"uuu\", event_nr=0, flags=0, string=\"new-name\"}) = "
+ "-1 EBADF (%m)\n");
init_s();
s.ioc.target_count = -1U;
@@ -98,9 +92,7 @@ main(void)
"{version=4.1.2, dev=makedev(18, 52), name=\"nnn\", "
"uuid=\"uuu\", target_count=4294967295, flags=0, "
"{sector_start=0, length=0, target_type=\"\", string=\"\"}, "
- "/* misplaced struct dm_target_spec */ ...} => "
- "{version=4.1.2, dev=makedev(18, 52), name=\"nnn\", "
- "uuid=\"uuu\", flags=0}) = -1 EBADF (%m)\n");
+ "/* misplaced struct dm_target_spec */ ...}) = -1 EBADF (%m)\n");
puts("+++ exited with 0 +++");
return 0;
--
1.7.10.4
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
next prev parent reply other threads:[~2016-10-09 13:30 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <alpine.LRH.2.02.1608221155410.17400@file01.intranet.prod.int.rdu2.redhat.com>
[not found] ` <20160822170920.GA5147@altlinux.org>
[not found] ` <alpine.LRH.2.02.1608231303510.7049@file01.intranet.prod.int.rdu2.redhat.com>
[not found] ` <20160824.233543.198328104871315294.yamato@redhat.com>
[not found] ` <20160824.233543.198328104871315294.yamato-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2016-08-25 12:27 ` [PATCH] Re: your dm patch for strace Mikulas Patocka
[not found] ` <alpine.LRH.2.02.1608250823130.24332-Hpncn10jQN4oNljnaZt3ZvA+iT7yCHsGwRM8/txMwJMAicBL8TP8PQ@public.gmane.org>
2016-09-12 17:10 ` Dmitry V. Levin
[not found] ` <20160912171029.GA5263-u2l5PoMzF/Vg9hUCZPvPmw@public.gmane.org>
2016-10-02 21:59 ` Mikulas Patocka
[not found] ` <alpine.LRH.2.02.1610021751280.29417-Hpncn10jQN4oNljnaZt3ZvA+iT7yCHsGwRM8/txMwJMAicBL8TP8PQ@public.gmane.org>
2016-10-05 10:28 ` Masatake YAMATO
[not found] ` <20161005.192828.566127461630656590.yamato-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2016-10-09 13:27 ` [PATCH 00/21] Some possible additions to the DM ioctl " Eugene Syromyatnikov
2016-10-09 13:28 ` [PATCH 01/21] tests/ioctl_dm: Formatting Eugene Syromyatnikov
2016-10-09 13:28 ` [PATCH 02/21] dm: whitespace fixes Eugene Syromyatnikov
2016-10-09 13:28 ` [PATCH 03/21] tests: Working around bounds check Eugene Syromyatnikov
2016-10-09 13:28 ` [PATCH 04/21] dm: Minor output tweaks Eugene Syromyatnikov
2016-10-09 13:29 ` [PATCH 05/21] xlat: Add values for dm_flags Eugene Syromyatnikov
2016-10-09 13:29 ` [PATCH 06/21] dm: Some future-proofing by means of compile-time DM_VERSION_MAJOR check Eugene Syromyatnikov
2016-10-09 13:29 ` [PATCH 07/21] dm: Add definitions for ioctl commands not implemented initially Eugene Syromyatnikov
2016-10-09 13:30 ` [PATCH 08/21] dm: Use static constants for offset sizes Eugene Syromyatnikov
2016-10-09 13:30 ` [PATCH 09/21] dm: Remove char * cast Eugene Syromyatnikov
2016-10-09 13:30 ` [PATCH 10/21] dm: use => instead of , for splitting output structure from input Eugene Syromyatnikov
2016-10-09 13:30 ` Eugene Syromyatnikov [this message]
2016-10-09 13:30 ` [PATCH 12/21] dm: Add inttypes.h, include reorder Eugene Syromyatnikov
2016-10-09 13:30 ` [PATCH 13/21] dm: Move printing of dm_ioctl fields before allocation of extra data Eugene Syromyatnikov
2016-10-09 13:30 ` [PATCH 14/21] dm: replace abbrev branching with goto Eugene Syromyatnikov
2016-10-09 13:31 ` [PATCH 15/21] dm: Additional data_size/data_start checks Eugene Syromyatnikov
2016-10-09 13:31 ` [PATCH 16/21] dm: Add comment regarding intended fall-through in switch statement Eugene Syromyatnikov
2016-10-09 13:31 ` [PATCH 17/21] dm: Add data_size and data_offset fields to output Eugene Syromyatnikov
2016-10-09 13:31 ` [PATCH 18/21] tests/ioctl_dm: Allow passing size and data_start to init_s Eugene Syromyatnikov
2016-10-09 13:31 ` [PATCH 19/21] dm: Add check whether command uses parameters Eugene Syromyatnikov
2016-10-09 13:31 ` [PATCH 20/21] dm: Fix printing of version field Eugene Syromyatnikov
2016-10-09 13:31 ` [PATCH 21/21] dm: rewrite structure decoding Eugene Syromyatnikov
2016-10-10 10:27 ` [PATCH] Re: your dm patch for strace Mikulas Patocka
2016-10-11 22:38 ` [PATCH 0/9] Additional checks for strace DM ioctl decoder test Eugene Syromyatnikov
2016-10-19 20:31 ` [PATCH] device mapper ioctl Mikulas Patocka
[not found] ` <alpine.LRH.2.02.1610191626360.628-Hpncn10jQN4oNljnaZt3ZvA+iT7yCHsGwRM8/txMwJMAicBL8TP8PQ@public.gmane.org>
2016-11-10 21:01 ` Eugene Syromyatnikov
[not found] ` <CACGkJdts9AKHnXb+b6J2kfpDNZJZW12WaNaYukrA11PHtAydag-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2016-11-11 3:13 ` Masatake YAMATO
2016-10-11 22:38 ` [PATCH 1/9] util: Add support for QUOTE_0_TERMINATED in user_style to ptrintstr_ex Eugene Syromyatnikov
2016-10-11 22:38 ` [PATCH 2/9] tests: Add check for printing of overlength strings to ioctl_dm test Eugene Syromyatnikov
2016-10-11 22:38 ` [PATCH 3/9] tests: Add check for presence of HAVE_LINUX_DM_IOCTL_H macro definition " Eugene Syromyatnikov
2016-10-11 22:38 ` [PATCH 4/9] tests/ioctl_dm: whitespace Eugene Syromyatnikov
2016-10-11 22:38 ` [PATCH 5/9] dm: Fix comma printing for the case when dm_target_msg structure is inaccessible Eugene Syromyatnikov
2016-10-11 22:39 ` [PATCH 6/9] tests/ioctl_dm: overly long string printing checks Eugene Syromyatnikov
2016-10-11 22:39 ` [PATCH 7/9] tests: Some additional checks for ioctl_dm test Eugene Syromyatnikov
2016-10-11 22:39 ` [PATCH 8/9] tests: Add ioctl_dm to .gitignore Eugene Syromyatnikov
2016-10-11 22:39 ` [PATCH 9/9] tests: Add checks for abbreviated DM ioctl output Eugene Syromyatnikov
2016-10-08 17:45 ` [PATCH] Re: your dm patch for strace Eugene Syromyatnikov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161009133033.GA3547@obsidian \
--to=evgsyr-re5jqeeqqe8avxtiumwx3w@public.gmane.org \
--cc=dm-devel-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org \
--cc=mpatocka-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org \
--cc=strace-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).