patches/kernel/0060-ACPI-APEI-adjust-a-local-variable-type-in-ghes_iorem.patch

   1 From 012bd636105426b93026d594261663e8a728dcc1 Mon Sep 17 00:00:00 2001
   2 From: Jan Beulich <JBeulich@suse.com>
   3 Date: Mon, 25 Sep 2017 02:06:19 -0600
   4 Subject: [PATCH 060/233] ACPI / APEI: adjust a local variable type in
   5  ghes_ioremap_pfn_irq()
   6 MIME-Version: 1.0
   7 Content-Type: text/plain; charset=UTF-8
   8 Content-Transfer-Encoding: 8bit
   9
  10 CVE-2017-5754
  11
  12 Match up with what 7edda0886b ("acpi: apei: handle SEA notification
  13 type for ARMv8") did for ghes_ioremap_pfn_nmi().
  14
  15 Signed-off-by: Jan Beulich <jbeulich@suse.com>
  16 Reviewed-by: Borislav Petkov <bp@suse.de>
  17 Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
  18 (cherry picked from commit 095f613c6b386a1704b73a549e9ba66c1d5381ae)
  19 Signed-off-by: Andy Whitcroft <apw@canonical.com>
  20 Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
  21 (cherry picked from commit 0a5c092882b0ead111dc3a6bbaa870665b54d796)
  22 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
  23 ---
  24  drivers/acpi/apei/ghes.c | 3 ++-
  25  1 file changed, 2 insertions(+), 1 deletion(-)
  26
  27 diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c
  28 index d661d452b238..3628078ee351 100644
  29 --- a/drivers/acpi/apei/ghes.c
  30 +++ b/drivers/acpi/apei/ghes.c
  31 @@ -174,7 +174,8 @@ static void __iomem *ghes_ioremap_pfn_nmi(u64 pfn)
  32
  33  static void __iomem *ghes_ioremap_pfn_irq(u64 pfn)
  34  {
  35 -       unsigned long vaddr, paddr;
  36 +       unsigned long vaddr;
  37 +       phys_addr_t paddr;
  38         pgprot_t prot;
  39
  40         vaddr = (unsigned long)GHES_IOREMAP_IRQ_PAGE(ghes_ioremap_area->addr);
  41 --
  42 2.14.2
  43