lkml.org 
[lkml]   [2017]   [Oct]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v9 08/29] x86/mpx: Do not use SIB.base if its value is 101b and ModRM.mod = 0
    Date
    Section 2.2.1.2 of the Intel 64 and IA-32 Architectures Software
    Developer's Manual volume 2A states that if a SIB byte is used and
    SIB.base is 101b and ModRM.mod is zero, then the base part of the base
    part of the effective address computation is null. To signal this
    situation, a -EDOM error is returned to indicate callers to ignore the
    base value present in the register operand.

    In this scenario, a 32-bit displacement follows the SIB byte. Displacement
    is obtained when the instruction decoder parses the operands.

    Cc: Borislav Petkov <bp@suse.de>
    Cc: Andy Lutomirski <luto@kernel.org>
    Cc: Dave Hansen <dave.hansen@linux.intel.com>
    Cc: Adam Buchbinder <adam.buchbinder@gmail.com>
    Cc: Colin Ian King <colin.king@canonical.com>
    Cc: Lorenzo Stoakes <lstoakes@gmail.com>
    Cc: Qiaowei Ren <qiaowei.ren@intel.com>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Nathan Howard <liverlint@gmail.com>
    Cc: Adan Hawthorn <adanhawthorn@gmail.com>
    Cc: Joe Perches <joe@perches.com>
    Cc: Ravi V. Shankar <ravi.v.shankar@intel.com>
    Cc: x86@kernel.org
    Reviewed-by: Borislav Petkov <bp@suse.de>
    Signed-off-by: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
    ---
    arch/x86/mm/mpx.c | 28 ++++++++++++++++++++--------
    1 file changed, 20 insertions(+), 8 deletions(-)

    diff --git a/arch/x86/mm/mpx.c b/arch/x86/mm/mpx.c
    index 2ad1d4a..581a960 100644
    --- a/arch/x86/mm/mpx.c
    +++ b/arch/x86/mm/mpx.c
    @@ -123,6 +123,14 @@ static int get_reg_offset(struct insn *insn, struct pt_regs *regs,

    case REG_TYPE_BASE:
    regno = X86_SIB_BASE(insn->sib.value);
    + /*
    + * If ModRM.mod is 0 and SIB.base == 5, the base of the
    + * register-indirect addressing is 0. In this case, a
    + * 32-bit displacement follows the SIB byte.
    + */
    + if (!X86_MODRM_MOD(insn->modrm.value) && regno == 5)
    + return -EDOM;
    +
    if (X86_REX_B(insn->rex_prefix.value))
    regno += 8;
    break;
    @@ -164,16 +172,22 @@ static void __user *mpx_get_addr_ref(struct insn *insn, struct pt_regs *regs)
    eff_addr = regs_get_register(regs, addr_offset);
    } else {
    if (insn->sib.nbytes) {
    + /*
    + * Negative values in the base and index offset means
    + * an error when decoding the SIB byte. Except -EDOM,
    + * which means that the registers should not be used
    + * in the address computation.
    + */
    base_offset = get_reg_offset(insn, regs, REG_TYPE_BASE);
    - if (base_offset < 0)
    + if (base_offset == -EDOM)
    + base = 0;
    + else if (base_offset < 0)
    goto out;
    + else
    + base = regs_get_register(regs, base_offset);

    indx_offset = get_reg_offset(insn, regs, REG_TYPE_INDEX);
    - /*
    - * A negative offset generally means a error, except
    - * -EDOM, which means that the contents of the register
    - * should not be used as index.
    - */
    +
    if (indx_offset == -EDOM)
    indx = 0;
    else if (indx_offset < 0)
    @@ -181,8 +195,6 @@ static void __user *mpx_get_addr_ref(struct insn *insn, struct pt_regs *regs)
    else
    indx = regs_get_register(regs, indx_offset);

    - base = regs_get_register(regs, base_offset);
    -
    eff_addr = base + indx * (1 << X86_SIB_SCALE(sib));
    } else {
    addr_offset = get_reg_offset(insn, regs, REG_TYPE_RM);
    --
    2.7.4
    \
     
     \ /
      Last update: 2017-10-04 06:02    [W:4.082 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site