Re: [Qemu-devel] [PATCH] target/i386: Generate #UD when applying LOCK to a register

[Philippe Mathieu-Daudé]

On 2/6/19 6:42 AM, Richard Henderson wrote:
> Ping.
> 
> On 12/7/18 5:09 PM, Richard Henderson wrote:
>> This covers inc, dec, and the bit test instructions.
>>
>> I believe we've finally covered all of the cases for
>> which we have an atomic path that would use the cpu_A0
>> temp, which is only initialized for address sources.
>>
>> Fixes: https://bugs.launchpad.net/qemu/+bug/1803160/comments/4

Reported-by: Alberto Ortega <address@hidden>

>> Signed-off-by: Richard Henderson <address@hidden>

Reviewed-by: Philippe Mathieu-Daudé <address@hidden>

>> ---
>>  target/i386/translate.c | 11 +++++++++++
>>  1 file changed, 11 insertions(+)
>>
>> diff --git a/target/i386/translate.c b/target/i386/translate.c
>> index 0dd5fbe45c..eb52322a47 100644
>> --- a/target/i386/translate.c
>> +++ b/target/i386/translate.c
>> @@ -1398,6 +1398,11 @@ static void gen_op(DisasContext *s1, int op, TCGMemOp 
>> ot, int d)
>>  static void gen_inc(DisasContext *s1, TCGMemOp ot, int d, int c)
>>  {
>>      if (s1->prefix & PREFIX_LOCK) {
>> +        if (d != OR_TMP0) {
>> +            /* Lock prefix when destination is not memory.  */
>> +            gen_illegal_opcode(s1);
>> +            return;
>> +        }
>>          tcg_gen_movi_tl(s1->T0, c > 0 ? 1 : -1);
>>          tcg_gen_atomic_add_fetch_tl(s1->T0, s1->A0, s1->T0,
>>                                      s1->mem_index, ot | MO_LE);
>> @@ -6764,6 +6769,9 @@ static target_ulong disas_insn(DisasContext *s, 
>> CPUState *cpu)
>>                  gen_op_ld_v(s, ot, s->T0, s->A0);
>>              }
>>          } else {
>> +            if (s->prefix & PREFIX_LOCK) {
>> +                goto illegal_op;
>> +            }
>>              gen_op_mov_v_reg(s, ot, s->T0, rm);
>>          }
>>          /* load shift */
>> @@ -6803,6 +6811,9 @@ static target_ulong disas_insn(DisasContext *s, 
>> CPUState *cpu)
>>                  gen_op_ld_v(s, ot, s->T0, s->A0);
>>              }
>>          } else {
>> +            if (s->prefix & PREFIX_LOCK) {
>> +                goto illegal_op;
>> +            }
>>              gen_op_mov_v_reg(s, ot, s->T0, rm);
>>          }
>>      bt_op:
>>
> 
>