powerpc/tm: Fix restoring FP/VMX facility incorrectly on interrupts (CVE-2019-15031) / powerpc/tm: Fix FP/VMX unavailable exceptions inside a transaction (CVE-2019-15030)

Bug #1843533 reported by bugproxy on 2019-09-11
6
This bug affects 1 person
Affects Status Importance Assigned to Milestone
The Ubuntu-power-systems project
High
Canonical Kernel Team
linux (Ubuntu)
High
Canonical Kernel Team
Bionic
High
Canonical Kernel Team
Disco
High
Canonical Kernel Team

Bug Description

SRU Justification:
==================

[Impact]

* Fix FP/VMX vulerabilities - CVE-2019-15030 and CVE-2019-15031

[Fix]

* a8318c13e79badb92bc6640704a64cc022a6eb97 a8318c1 "powerpc/tm: Fix restoring FP/VMX facility incorrectly on interrupts"

* 8205d5d98ef7f155de211f5e2eb6ca03d95a5a60 8205d5d "powerpc/tm: Fix FP/VMX unavailable exceptions inside a transaction"

[Test Case]

* the commits point to a simple test case in tools/testing/selftests/powerpc/tm/tm-poison.c

[Regression Potential]

* The regression potential can be considered as moderate

[Other Info]

* a8318c1 fixes CVE-2019-15031

* 8205d5d fixes CVE-2019-15030

* the commits are in 5.3, hence already in Eoan

* simple cherry-pick (on bionic master-next with '--strategy=recursive -X theirs -s -e -x') could be done
__________

== Comment: #0 - Michael Ranweiler <email address hidden> - 2019-09-11 00:49:28 ==
There are two problems/CVEs for power that we'd appreciate adding:

https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=a8318c13e79badb92bc6640704a64cc022a6eb97

powerpc/tm: Fix restoring FP/VMX facility incorrectly on interrupts

When in userspace and MSR FP=0 the hardware FP state is unrelated to
the current process. This is extended for transactions where if tbegin
is run with FP=0, the hardware checkpoint FP state will also be
unrelated to the current process. Due to this, we need to ensure this
hardware checkpoint is updated with the correct state before we enable
FP for this process.

Unfortunately we get this wrong when returning to a process from a
hardware interrupt. A process that starts a transaction with FP=0 can
take an interrupt. When the kernel returns back to that process, we
change to FP=1 but with hardware checkpoint FP state not updated. If
this transaction is then rolled back, the FP registers now contain the
wrong state.

The process looks like this:
   Userspace: Kernel

               Start userspace
                with MSR FP=0 TM=1
                  < -----
   ...
   tbegin
   bne
               Hardware interrupt
                   ---- >
                                    <do_IRQ...>
                                    ....
                                    ret_from_except
                                      restore_math()
            /* sees FP=0 */
                                        restore_fp()
                                          tm_active_with_fp()
         /* sees FP=1 (Incorrect) */
                                          load_fp_state()
                                        FP = 0 -> 1
                  < -----
               Return to userspace
                 with MSR TM=1 FP=1
                 with junk in the FP TM checkpoint
   TM rollback
   reads FP junk

When returning from the hardware exception, tm_active_with_fp() is
incorrectly making restore_fp() call load_fp_state() which is setting
FP=1.

The fix is to remove tm_active_with_fp().

tm_active_with_fp() is attempting to handle the case where FP state
has been changed inside a transaction. In this case the checkpointed
and transactional FP state is different and hence we must restore the
FP state (ie. we can't do lazy FP restore inside a transaction that's
used FP). It's safe to remove tm_active_with_fp() as this case is
handled by restore_tm_state(). restore_tm_state() detects if FP has
been using inside a transaction and will set load_fp and call
restore_math() to ensure the FP state (checkpoint and transaction) is
restored.

This is a data integrity problem for the current process as the FP
registers are corrupted. It's also a security problem as the FP
registers from one process may be leaked to another.

Similarly for VMX.

A simple testcase to replicate this will be posted to
tools/testing/selftests/powerpc/tm/tm-poison.c

This fixes CVE-2019-15031.

Fixes: a7771176b439 ("powerpc: Don't enable FP/Altivec if not checkpointed")
Cc: <email address hidden> # 4.15+
Signed-off-by: Gustavo Romero <email address hidden>
Signed-off-by: Michael Neuling <email address hidden>
Signed-off-by: Michael Ellerman <email address hidden>
Link: https://<email address hidden>
.
2.
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=8205d5d98ef7f155de211f5e2eb6ca03d95a5a60

powerpc/tm: Fix FP/VMX unavailable exceptions inside a transaction

When we take an FP unavailable exception in a transaction we have to
account for the hardware FP TM checkpointed registers being
incorrect. In this case for this process we know the current and
checkpointed FP registers must be the same (since FP wasn't used
inside the transaction) hence in the thread_struct we copy the current
FP registers to the checkpointed ones.

This copy is done in tm_reclaim_thread(). We use thread->ckpt_regs.msr
to determine if FP was on when in userspace. thread->ckpt_regs.msr
represents the state of the MSR when exiting userspace. This is setup
by check_if_tm_restore_required().

Unfortunatley there is an optimisation in giveup_all() which returns
early if tsk->thread.regs->msr (via local variable `usermsr`) has
FP=VEC=VSX=SPE=0. This optimisation means that
check_if_tm_restore_required() is not called and hence
thread->ckpt_regs.msr is not updated and will contain an old value.

This can happen if due to load_fp=255 we start a userspace process
with MSR FP=1 and then we are context switched out. In this case
thread->ckpt_regs.msr will contain FP=1. If that same process is then
context switched in and load_fp overflows, MSR will have FP=0. If that
process now enters a transaction and does an FP instruction, the FP
unavailable will not update thread->ckpt_regs.msr (the bug) and MSR
FP=1 will be retained in thread->ckpt_regs.msr. tm_reclaim_thread()
will then not perform the required memcpy and the checkpointed FP regs
in the thread struct will contain the wrong values.

The code path for this happening is:

       Userspace: Kernel
                   Start userspace
                    with MSR FP/VEC/VSX/SPE=0 TM=1
                      < -----
       ...
       tbegin
       bne
       fp instruction
                   FP unavailable
                       ---- >
                                        fp_unavailable_tm()
       tm_reclaim_current()
         tm_reclaim_thread()
           giveup_all()
             return early since FP/VMX/VSX=0
      /* ckpt MSR not updated (Incorrect) */
           tm_reclaim()
             /* thread_struct ckpt FP regs contain junk (OK) */
                                              /* Sees ckpt MSR FP=1 (Incorrect) */
           no memcpy() performed
             /* thread_struct ckpt FP regs not fixed (Incorrect) */
       tm_recheckpoint()
          /* Put junk in hardware checkpoint FP regs */
                                         ....
                      < -----
                   Return to userspace
                     with MSR TM=1 FP=1
                     with junk in the FP TM checkpoint
       TM rollback
       reads FP junk

This is a data integrity problem for the current process as the FP
registers are corrupted. It's also a security problem as the FP
registers from one process may be leaked to another.

This patch moves up check_if_tm_restore_required() in giveup_all() to
ensure thread->ckpt_regs.msr is updated correctly.

A simple testcase to replicate this will be posted to
tools/testing/selftests/powerpc/tm/tm-poison.c

Similarly for VMX.

This fixes CVE-2019-15030.

Fixes: f48e91e87e67 ("powerpc/tm: Fix FP and VMX register corruption")
Cc: <email address hidden> # 4.12+
Signed-off-by: Gustavo Romero <email address hidden>
Signed-off-by: Michael Neuling <email address hidden>
Signed-off-by: Michael Ellerman <email address hidden>
Link: https://<email address hidden>

bugproxy (bugproxy) on 2019-09-11
tags: added: architecture-ppc64le bugnameltc-181414 severity-high targetmilestone-inin18044
Changed in ubuntu:
assignee: nobody → Ubuntu on IBM Power Systems Bug Triage (ubuntu-power-triage)
affects: ubuntu → linux (Ubuntu)
Changed in ubuntu-power-systems:
importance: Undecided → High
assignee: nobody → Canonical Kernel Team (canonical-kernel-team)
status: New → Triaged
Frank Heimes (frank-heimes) wrote :

The commits are already incl. in Eoan master-next,
and with that they are already in eoan-proposed:
linux-generic | 5.3.0.10.11 | eoan-proposed | s390x

Hence SRU for Disco and Bionic is now needed.

Frank Heimes (frank-heimes) wrote :
description: updated
Changed in ubuntu-power-systems:
status: Triaged → In Progress
Manoj Iyer (manjo) on 2019-09-16
Changed in linux (Ubuntu):
assignee: Ubuntu on IBM Power Systems Bug Triage (ubuntu-power-triage) → Canonical Kernel Team (canonical-kernel-team)
importance: Undecided → High
Changed in linux (Ubuntu):
status: New → In Progress
Launchpad Janitor (janitor) wrote :

This bug was fixed in the package linux - 5.0.0-29.31

---------------
linux (5.0.0-29.31) disco; urgency=medium

  * powerpc/tm: Fix restoring FP/VMX facility incorrectly on interrupts
    (CVE-2019-15031) / powerpc/tm: Fix FP/VMX unavailable exceptions inside a
    transaction (CVE-2019-15030) (LP: #1843533) // CVE-2019-15031
    - powerpc/tm: Fix FP/VMX unavailable exceptions inside a transaction
    - powerpc/tm: Fix restoring FP/VMX facility incorrectly on interrupts

  * CVE-2019-14835
    - vhost: fix dirty log buffer overflow

  * Packaging resync (LP: #1786013)
    - [Packaging] resync getabis

 -- Stefan Bader <email address hidden> Thu, 12 Sep 2019 11:19:04 +0200

Changed in linux (Ubuntu):
status: In Progress → Fix Released
Manoj Iyer (manjo) on 2019-09-18
Changed in linux (Ubuntu Bionic):
importance: Undecided → High
Changed in linux (Ubuntu Disco):
importance: Undecided → Critical
importance: Critical → High
Changed in linux (Ubuntu Bionic):
assignee: nobody → Canonical Kernel Team (canonical-kernel-team)
Changed in linux (Ubuntu Disco):
assignee: nobody → Canonical Kernel Team (canonical-kernel-team)
Changed in linux (Ubuntu Disco):
status: New → Fix Released
Changed in linux (Ubuntu Bionic):
status: New → Confirmed
Tyler Hicks (tyhicks) wrote :

The Bionic kernel was also released yesterday with the required fixes. I'm not sure why this bug wasn't automatically updated. Here is the specific package:

https://launchpad.net/ubuntu/+source/linux/4.15.0-64.73

Changed in linux (Ubuntu Bionic):
status: Confirmed → Fix Released
Changed in ubuntu-power-systems:
status: In Progress → Fix Released
To post a comment you must log in.
This report contains Public information  Edit
Everyone can see this information.

Other bug subscribers