From patchwork Sun Oct 9 13:30:48 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eugene Syromyatnikov X-Patchwork-Id: 9369135 X-Patchwork-Delegate: snitzer@redhat.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D4A4660487 for ; Mon, 10 Oct 2016 08:33:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C768D29325 for ; Mon, 10 Oct 2016 08:33:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BC5372933B; Mon, 10 Oct 2016 08:33:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from mx4-phx2.redhat.com (mx4-phx2.redhat.com [209.132.183.25]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 75C3B29325 for ; Mon, 10 Oct 2016 08:33:23 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by mx4-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id u9A8UpK3012989; Mon, 10 Oct 2016 04:30:51 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id u99DUrkF016651 for ; Sun, 9 Oct 2016 09:30:53 -0400 Received: from mx1.redhat.com (ext-mx09.extmail.prod.ext.phx2.redhat.com [10.5.110.38]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u99DUr9d012777 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Sun, 9 Oct 2016 09:30:53 -0400 Received: from mail-lf0-f68.google.com (mail-lf0-f68.google.com [209.85.215.68]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id DA4684E4C1; Sun, 9 Oct 2016 13:30:52 +0000 (UTC) Received: by mail-lf0-f68.google.com with SMTP id p80so5474888lfp.1; Sun, 09 Oct 2016 06:30:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=HyuZA07IAfeX9n3QIuqriymygVNT9o2N++0XkGP2sjM=; b=GPr4XPONgDvA/JKP7Ri4oSVTv0SgJevLUSSXHN6RtfhOHUMau1rQ/8Lftwhk9mU9T+ 1jiZZ/QF5KEqpHE4XmpY8QZuDPPZivtPQYJo9wIo03JnBy+oUoB+MKnd31TkFoNI1CB5 GxRZA7ln7+5s9KWxjtKiOFQSjUeNk/ruIHOVA/XCV6pA7SLT4uToTHs2FYBOUhZGEdiR mdqW8V4uAsSCKX/yTcr9JhfNmK4SNjXweVykunfL4Xvh0/zkIjxbVV9u/SJRBBbzUsWx uTQtDciSrw5cDym+5pu98LbceB8f3v0Q3MOM81cJmK45eXlssUDmMOiOZkvs0y55zA6e Ab6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=HyuZA07IAfeX9n3QIuqriymygVNT9o2N++0XkGP2sjM=; b=FvSN3Ljfcg6MNdGzBl7FmmR/H1VvDDJMtJth/yU01WMnkDxDGsDP/TVjTknsZAFM3A UVFS/YUvmVVxRpNhRFAMx0sP+CzU0IzA7aaktqzSNKrFzmX3H2cB5qUnZ60a40dzcGNt jvT7OW1jOfY6aPF0N33OncUNGDDyIdxo/USajXEAYJtzikPbgVj+4zEknW6Jr+Ruh8bh VQ7AO/TyJ5xhxFBioNnY0z/8JynXqjhRY1uSK8uJeJsMEe/tgSXJK+8kmaJSFAGeifXo ne3ERvjRniosdOM9XpDFGR98GmUM1OACRnsq1jmn2X4k/isQfwhVnevk7tWYn15QdrKg QeSA== X-Gm-Message-State: AA6/9RkN7M+hrimzRr06Rd4f2yo8waQCp5lqZ6dnhyNA026fFRPOH8hqFwCCpzSwH36g/A== X-Received: by 10.25.87.17 with SMTP id l17mr11854350lfb.153.1476019851247; Sun, 09 Oct 2016 06:30:51 -0700 (PDT) Received: from obsidian (broadband-46-188-15-144.2com.net. [46.188.15.144]) by smtp.gmail.com with ESMTPSA id e70sm5138132lji.30.2016.10.09.06.30.50 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Sun, 09 Oct 2016 06:30:50 -0700 (PDT) Date: Sun, 9 Oct 2016 16:30:48 +0300 From: Eugene Syromyatnikov To: strace-devel@lists.sourceforge.net Message-ID: <20161009133048.GA3769@obsidian> References: <20161005.192828.566127461630656590.yamato@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20161005.192828.566127461630656590.yamato@redhat.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Sun, 09 Oct 2016 13:30:53 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Sun, 09 Oct 2016 13:30:53 +0000 (UTC) for IP:'209.85.215.68' DOMAIN:'mail-lf0-f68.google.com' HELO:'mail-lf0-f68.google.com' FROM:'evgsyr@gmail.com' RCPT:'' X-RedHat-Spam-Score: 0.68 (BAYES_50, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_PASS) 209.85.215.68 mail-lf0-f68.google.com 209.85.215.68 mail-lf0-f68.google.com X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-Scanned-By: MIMEDefang 2.78 on 10.5.110.38 X-loop: dm-devel@redhat.com X-Mailman-Approved-At: Mon, 10 Oct 2016 04:29:54 -0400 Cc: dm-devel@redhat.com, mpatocka@redhat.com, yamato@redhat.com Subject: [dm-devel] [PATCH 13/21] dm: Move printing of dm_ioctl fields before allocation of extra data X-BeenThere: dm-devel@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: device-mapper development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com X-Virus-Scanned: ClamAV using ClamSMTP --- dm.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dm.c b/dm.c index a11196f..73a9b57 100644 --- a/dm.c +++ b/dm.c @@ -335,6 +335,10 @@ dm_known_ioctl(struct tcb *tcp, const unsigned int code, long arg) goto skip; } + dm_decode_device(code, ioc); + dm_decode_values(tcp, code, ioc); + dm_decode_flags(ioc); + if (ioc->data_size > sizeof(ioc)) { extra = malloc(ioc->data_size); if (extra) { @@ -346,9 +350,6 @@ 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); if (abbrev(tcp)) tprints(", ..."); else