lkml.org 
[lkml]   [2021]   [Mar]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip: x86/core] x86/tools/insn_sanity: Convert to insn_decode()
    The following commit has been merged into the x86/core branch of tip:

    Commit-ID: a277ce601cd1c75412a82dfcff547b3173098ef0
    Gitweb: https://git.kernel.org/tip/a277ce601cd1c75412a82dfcff547b3173098ef0
    Author: Borislav Petkov <bp@suse.de>
    AuthorDate: Sun, 22 Nov 2020 18:11:10 +01:00
    Committer: Borislav Petkov <bp@suse.de>
    CommitterDate: Mon, 15 Mar 2021 12:21:11 +01:00

    x86/tools/insn_sanity: Convert to insn_decode()

    Simplify code, no functional changes.

    Signed-off-by: Borislav Petkov <bp@suse.de>
    Link: https://lkml.kernel.org/r/20210304174237.31945-19-bp@alien8.de
    ---
    arch/x86/tools/insn_sanity.c | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    diff --git a/arch/x86/tools/insn_sanity.c b/arch/x86/tools/insn_sanity.c
    index c6a0000..213f35f 100644
    --- a/arch/x86/tools/insn_sanity.c
    +++ b/arch/x86/tools/insn_sanity.c
    @@ -218,8 +218,8 @@ static void parse_args(int argc, char **argv)

    int main(int argc, char **argv)
    {
    + int insns = 0, ret;
    struct insn insn;
    - int insns = 0;
    int errors = 0;
    unsigned long i;
    unsigned char insn_buff[MAX_INSN_SIZE * 2];
    @@ -237,15 +237,15 @@ int main(int argc, char **argv)
    continue;

    /* Decode an instruction */
    - insn_init(&insn, insn_buff, sizeof(insn_buff), x86_64);
    - insn_get_length(&insn);
    + ret = insn_decode(&insn, insn_buff, sizeof(insn_buff),
    + x86_64 ? INSN_MODE_64 : INSN_MODE_32);

    if (insn.next_byte <= insn.kaddr ||
    insn.kaddr + MAX_INSN_SIZE < insn.next_byte) {
    /* Access out-of-range memory */
    dump_stream(stderr, "Error: Found an access violation", i, insn_buff, &insn);
    errors++;
    - } else if (verbose && !insn_complete(&insn))
    + } else if (verbose && ret < 0)
    dump_stream(stdout, "Info: Found an undecodable input", i, insn_buff, &insn);
    else if (verbose >= 2)
    dump_insn(stdout, &insn);
    \
     
     \ /
      Last update: 2021-03-15 16:49    [W:4.705 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site