Skip to content
  1. Nov 05, 2016
    • Linus Torvalds's avatar
      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm · 66cecb67
      Linus Torvalds authored
      Pull KVM updates from Paolo Bonzini:
       "One NULL pointer dereference, and two fixes for regressions introduced
        during the merge window.
      
        The rest are fixes for MIPS, s390 and nested VMX"
      
      * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
        kvm: x86: Check memopp before dereference (CVE-2016-8630)
        kvm: nVMX: VMCLEAR an active shadow VMCS after last use
        KVM: x86: drop TSC offsetting kvm_x86_ops to fix KVM_GET/SET_CLOCK
        KVM: x86: fix wbinvd_dirty_mask use-after-free
        kvm/x86: Show WRMSR data is in hex
        kvm: nVMX: Fix kernel panics induced by illegal INVEPT/INVVPID types
        KVM: document lock orders
        KVM: fix OOPS on flush_work
        KVM: s390: Fix STHYI buffer alignment for diag224
        KVM: MIPS: Precalculate MMIO load resume PC
        KVM: MIPS: Make ERET handle ERL before EXL
        KVM: MIPS: Fix lazy user ASID regenerate for SMP
      66cecb67
    • Linus Torvalds's avatar
      Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus · 34c510b2
      Linus Torvalds authored
      Pull MIPS fixes from Ralf Baechle:
       "A set of MIPS fixes for 4.9:
      
         - lots of fixes for printk continuations
         - six fixes for FP related code.
         - fix max_low_pfn with disabled highmem
         - fix KASLR handling of NULL FDT and KASLR for generic kernels
         - fix build of compressed image
         - provide default mips_cpc_default_phys_base to ignore CPC
         - fix reboot on Malta"
      
      * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
        MIPS: Fix max_low_pfn with disabled highmem
        MIPS: Correct MIPS I FP sigcontext layout
        MIPS: Fix ISA I/II FP signal context offsets
        MIPS: Remove FIR from ISA I FP signal context
        MIPS: Fix ISA I FP sigcontext access violation handling
        MIPS: Fix FCSR Cause bit handling for correct SIGFPE issue
        MIPS: ptrace: Also initialize the FP context on individual FCSR writes
        MIPS: dump_tlb: Fix printk continuations
        MIPS: Fix __show_regs() output
        MIPS: traps: Fix output of show_code
        MIPS: traps: Fix output of show_stacktrace
        MIPS: traps: Fix output of show_backtrace
        MIPS: Fix build of compressed image
        MIPS: generic: Fix KASLR for generic kernel.
        MIPS: KASLR: Fix handling of NULL FDT
        MIPS: Malta: Fixup reboot
        MIPS: CPC: Provide default mips_cpc_default_phys_base to ignore CPC
      34c510b2
    • Linus Torvalds's avatar
      Merge branch 'parisc-4.9-3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux · f7df76e6
      Linus Torvalds authored
      Pull parisc updates from Helge Deller:
       "The first three patches are trivial and add some required KERN_CONT,
        ignore the new pkey syscalls on parisc and use the LINUX_GATEWAY_ADDR
        define instead of hardcoded values.
      
        The two patches from Dave Anglin are important.
      
        The first one avoids trashing the sr2 and sr3 space registers in the
        Light-weight syscall path. Especially the usage of sr3 is critical
        since it may get trashed by the interrupt handler.
      
        The second patch is even more important and tagged for stable series.
        It protects one critical section in the syscall entry path by
        disabling local interrupts. Without disabling interrupts, the sr7
        space register may not be in sync with the current stack setup and
        thus an incoming hardware interrupt may destroy memory in random
        userspace areas"
      
      * 'parisc-4.9-3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
        parisc: Ignore the pkey system calls for now
        parisc: Use LINUX_GATEWAY_ADDR define instead of hardcoded value
        parisc: Ensure consistent state when switching to kernel stack at syscall entry
        parisc: Avoid trashing sr2 and sr3 in LWS code
        parisc: use KERN_CONT when printing device inventory
      f7df76e6
  2. Nov 04, 2016
    • James Hogan's avatar
      MIPS: Fix max_low_pfn with disabled highmem · 16a767ec
      James Hogan authored
      
      
      When low memory doesn't reach HIGHMEM_START (e.g. up to 256MB at PA=0 is
      common) and highmem is present above HIGHMEM_START (e.g. on Malta the
      RAM overlayed by the IO region is aliased at PA=0x90000000), max_low_pfn
      will be initially calculated very large and then clipped down to
      HIGHMEM_START.
      
      This causes crashes when reading /sys/kernel/mm/page_idle/bitmap
      (i.e. CONFIG_IDLE_PAGE_TRACKING=y) when highmem is disabled. pfn_valid()
      will compare against max_mapnr which is derived from max_low_pfn when
      there is no highend_pfn set up, and will return true for PFNs right up
      to HIGHMEM_START, even though they are beyond the end of low memory and
      no page structs will actually exist for these PFNs.
      
      This is fixed by skipping high memory regions when initially calculating
      max_low_pfn if highmem is disabled, so it doesn't get clipped too high.
      We also clip regions which overlap the highmem boundary when highmem is
      disabled, so that max_pfn doesn't extend into highmem either.
      
      Signed-off-by: default avatarJames Hogan <james.hogan@imgtec.com>
      Cc: Paul Burton <paul.burton@imgtec.com>
      Cc: linux-mips@linux-mips.org
      Patchwork: https://patchwork.linux-mips.org/patch/14490/
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      16a767ec
    • Maciej W. Rozycki's avatar
      MIPS: Correct MIPS I FP sigcontext layout · f92722dc
      Maciej W. Rozycki authored
      Complement commit 80cbfad7
      
       ("MIPS: Correct MIPS I FP context
      layout") and correct the way Floating Point General registers are stored
      in a signal context with MIPS I hardware.
      
      Use the S.D and L.D assembly macros to have pairs of SWC1 instructions
      and pairs of LWC1 instructions produced, respectively, in an arrangement
      which makes the memory representation of floating-point data passed
      compatible with that used by hardware SDC1 and LDC1 instructions, where
      available, regardless of the hardware endianness used.  This matches the
      layout used by r4k_fpu.S, ensuring run-time compatibility for MIPS I
      software across all o32 hardware platforms.
      
      Define an EX2 macro to handle exceptions from both hardware instructions
      implicitly produced from S.D and L.D assembly macros.
      
      Signed-off-by: default avatarMaciej W. Rozycki <macro@imgtec.com>
      Cc: linux-mips@linux-mips.org
      Cc: linux-kernel@vger.kernel.org
      Patchwork: https://patchwork.linux-mips.org/patch/14477/
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      f92722dc
    • Maciej W. Rozycki's avatar
      MIPS: Fix ISA I/II FP signal context offsets · 758ef0a9
      Maciej W. Rozycki authored
      Fix a regression introduced with commit 2db9ca0a
      
       ("MIPS: Use struct
      mips_abi offsets to save FP context") for MIPS I/I FP signal contexts,
      by converting save/restore code to the updated internal API.  Start FGR
      offsets from 0 rather than SC_FPREGS from $a0 and use $a1 rather than
      the offset of SC_FPC_CSR from $a0 for the Floating Point Control/Status
      Register (FCSR).
      
      Document the new internal API and adjust assembly code formatting for
      consistency.
      
      Signed-off-by: default avatarMaciej W. Rozycki <macro@imgtec.com>
      Cc: Paul Burton <paul.burton@imgtec.com>
      Cc: linux-mips@linux-mips.org
      Cc: linux-kernel@vger.kernel.org
      Patchwork: https://patchwork.linux-mips.org/patch/14476/
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      758ef0a9
    • Maciej W. Rozycki's avatar
      MIPS: Remove FIR from ISA I FP signal context · 6daaa326
      Maciej W. Rozycki authored
      Complement commit e50c0a8f
      
       ("Support the MIPS32 / MIPS64 DSP ASE.")
      and remove the Floating Point Implementation Register (FIR) from the FP
      register set recorded in a signal context with MIPS I processors too, in
      line with the change applied to r4k_fpu.S.
      
      The `sc_fpc_eir' slot is unused according to our current ABI and the FIR
      register is read-only and always directly accessible from user software.
      
      [ralf@linux-mips.org: This is also required because the next commit depends
      on it.]
      
      Signed-off-by: default avatarMaciej W. Rozycki <macro@imgtec.com>
      Cc: linux-mips@linux-mips.org
      Cc: linux-kernel@vger.kernel.org
      Patchwork: https://patchwork.linux-mips.org/patch/14475/
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      6daaa326
    • Maciej W. Rozycki's avatar
      MIPS: Fix ISA I FP sigcontext access violation handling · 35938a00
      Maciej W. Rozycki authored
      
      
      Complement commit 0ae8dceaebe3 ("Merge with 2.3.10.") and use the local
      `fault' handler to recover from FP sigcontext access violation faults,
      like corresponding code does in r4k_fpu.S.  The `bad_stack' handler is
      in syscall.c and is not suitable here as we want to propagate the error
      condition up through the caller rather than killing the thread outright.
      
      Signed-off-by: default avatarMaciej W. Rozycki <macro@imgtec.com>
      Cc: linux-mips@linux-mips.org
      Cc: linux-kernel@vger.kernel.org
      Patchwork: https://patchwork.linux-mips.org/patch/14474/
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      35938a00
    • Maciej W. Rozycki's avatar
      MIPS: Fix FCSR Cause bit handling for correct SIGFPE issue · 5a1aca44
      Maciej W. Rozycki authored
      Sanitize FCSR Cause bit handling, following a trail of past attempts:
      
      * commit 42495484 ("MIPS: ptrace: Fix FP context restoration FCSR
      regression"),
      
      * commit 443c4403 ("MIPS: Always clear FCSR cause bits after
      emulation"),
      
      * commit 64bedffe ("MIPS: Clear [MSA]FPE CSR.Cause after
      notify_die()"),
      
      * commit b1442d39
      
       ("MIPS: Prevent user from setting FCSR cause
      bits"),
      
      * commit b54d2901517d ("Properly handle branch delay slots in connection
      with signals.").
      
      Specifically do not mask these bits out in ptrace(2) processing and send
      a SIGFPE signal instead whenever a matching pair of an FCSR Cause and
      Enable bit is seen as execution of an affected context is about to
      resume.  Only then clear Cause bits, and even then do not clear any bits
      that are set but masked with the respective Enable bits.  Adjust Cause
      bit clearing throughout code likewise, except within the FPU emulator
      proper where they are set according to IEEE 754 exceptions raised as the
      operation emulated executed.  Do so so that any IEEE 754 exceptions
      subject to their default handling are recorded like with operations
      executed by FPU hardware.
      
      Signed-off-by: default avatarMaciej W. Rozycki <macro@imgtec.com>
      Cc: Paul Burton <paul.burton@imgtec.com>
      Cc: James Hogan <james.hogan@imgtec.com>
      Cc: linux-mips@linux-mips.org
      Cc: linux-kernel@vger.kernel.org
      Patchwork: https://patchwork.linux-mips.org/patch/14460/
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      5a1aca44
    • Maciej W. Rozycki's avatar
      MIPS: ptrace: Also initialize the FP context on individual FCSR writes · c9e56039
      Maciej W. Rozycki authored
      Complement commit ac9ad83b
      
       ("MIPS: prevent FP context set via ptrace
      being discarded") and also initialize the FP context whenever FCSR alone
      is written with a PTRACE_POKEUSR request addressing FPC_CSR, rather than
      along with the full FPU register set in the case of the PTRACE_SETFPREGS
      request.
      
      Signed-off-by: default avatarMaciej W. Rozycki <macro@imgtec.com>
      Cc: Paul Burton <paul.burton@imgtec.com>
      Cc: James Hogan <james.hogan@imgtec.com>
      Cc: linux-mips@linux-mips.org
      Cc: linux-kernel@vger.kernel.org
      Patchwork: https://patchwork.linux-mips.org/patch/14459/
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      c9e56039
    • James Hogan's avatar
      MIPS: dump_tlb: Fix printk continuations · 8a98495c
      James Hogan authored
      Since commit 4bcc595c
      
       ("printk: reinstate KERN_CONT for printing
      continuation lines") the output from TLB dumps on MIPS has been
      pretty unreadable due to the lack of KERN_CONT markers. Use pr_cont to
      provide the appropriate markers & restore the expected output.
      
      Continuation is also used for the second line of each TLB entry printed
      in dump_tlb.c even though it has a newline, since it is a continuation
      of the interpretation of the same TLB entry. For example:
      
      [   46.371884] Index:  0 pgmask=16kb va=77654000 asid=73 gid=00
              [ri=0 xi=0 pa=ffc18000 c=5 d=0 v=1 g=0] [ri=0 xi=0 pa=ffc1c000 c=5 d=0 v=1 g=0]
      [   46.385380] Index: 12 pgmask=16kb va=004b4000 asid=73 gid=00
              [ri=0 xi=0 pa=00000000 c=0 d=0 v=0 g=0] [ri=0 xi=0 pa=ffb00000 c=5 d=1 v=1 g=0]
      
      Signed-off-by: default avatarJames Hogan <james.hogan@imgtec.com>
      Cc: Maciej W. Rozycki <macro@imgtec.com>
      Cc: linux-mips@linux-mips.org
      Patchwork: https://patchwork.linux-mips.org/patch/14444/
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      8a98495c
    • Paul Burton's avatar
      MIPS: Fix __show_regs() output · 752f5499
      Paul Burton authored
      Since commit 4bcc595c
      
       ("printk: reinstate KERN_CONT for printing
      continuation lines") the output from __show_regs() on MIPS has been
      pretty unreadable due to the lack of KERN_CONT markers. Use pr_cont to
      provide the appropriate markers & restore the expected register output.
      
      Signed-off-by: default avatarPaul Burton <paul.burton@imgtec.com>
      Signed-off-by: default avatarMatt Redfearn <matt.redfearn@imgtec.com>
      Cc: Maciej W. Rozycki <macro@imgtec.com>
      Cc: James Hogan <james.hogan@imgtec.com>
      Cc: linux-mips@linux-mips.org
      Cc: linux-kernel@vger.kernel.org
      Patchwork: https://patchwork.linux-mips.org/patch/14432/
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      752f5499
    • Matt Redfearn's avatar
      MIPS: traps: Fix output of show_code · 41000c58
      Matt Redfearn authored
      Since commit 4bcc595c
      
       ("printk: reinstate KERN_CONT for printing
      continuation lines") the output from show_code on MIPS has been
      pretty unreadable due to the lack of KERN_CONT markers. Use pr_cont to
      provide the appropriate markers & restore the expected output.
      
      Signed-off-by: default avatarMatt Redfearn <matt.redfearn@imgtec.com>
      Cc: Maciej W. Rozycki <macro@imgtec.com>
      Cc: James Hogan <james.hogan@imgtec.com>
      Cc: Paul Burton <paul.burton@imgtec.com>
      Cc: linux-mips@linux-mips.org
      Cc: linux-kernel@vger.kernel.org
      Patchwork: https://patchwork.linux-mips.org/patch/14431/
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      41000c58
    • Matt Redfearn's avatar
      MIPS: traps: Fix output of show_stacktrace · fe4e09e7
      Matt Redfearn authored
      Since commit 4bcc595c
      
       ("printk: reinstate KERN_CONT for printing
      continuation lines") the output from show_stacktrace on MIPS has been
      pretty unreadable due to the lack of KERN_CONT markers. Use pr_cont to
      provide the appropriate markers & restore the expected output. Also
      start a new line with printk such that the presence of timing
      information does not interfere with output.
      
      Signed-off-by: default avatarMatt Redfearn <matt.redfearn@imgtec.com>
      Cc: Maciej W. Rozycki <macro@imgtec.com>
      Cc: James Hogan <james.hogan@imgtec.com>
      Cc: Paul Burton <paul.burton@imgtec.com>
      Cc: linux-mips@linux-mips.org
      Cc: linux-kernel@vger.kernel.org
      Patchwork: https://patchwork.linux-mips.org/patch/14430/
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      fe4e09e7
    • Matt Redfearn's avatar
      MIPS: traps: Fix output of show_backtrace · bcf084de
      Matt Redfearn authored
      Since commit 4bcc595c
      
       ("printk: reinstate KERN_CONT for printing
      continuation lines") the output from show_backtrace on MIPS has been
      pretty unreadable due to the lack of KERN_CONT markers. Use pr_cont to
      provide the appropriate markers & restore the expected output.
      
      Signed-off-by: default avatarMatt Redfearn <matt.redfearn@imgtec.com>
      Cc: Maciej W. Rozycki <macro@imgtec.com>
      Cc: James Hogan <james.hogan@imgtec.com>
      Cc: Paul Burton <paul.burton@imgtec.com>
      Cc: linux-mips@linux-mips.org
      Cc: linux-kernel@vger.kernel.org
      Patchwork: https://patchwork.linux-mips.org/patch/14429/
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      bcf084de
    • Matt Redfearn's avatar
      MIPS: Fix build of compressed image · 818f38c5
      Matt Redfearn authored
      
      
      Changes introduced to arch/mips/Makefile for the generic kernel resulted
      in build errors when making a compressed image if platform-y has multiple
      values, like this:
      
      make[2]: *** No rule to make target `alchemy/'.
      make[1]: *** [vmlinuz] Error 2
      make[1]: Target `_all' not remade because of errors.
      make: *** [sub-make] Error 2
      make: Target `_all' not remade because of errors.
      
      Fix this by quoting $(platform-y) as it is passed to the Makefile in
      arch/mips/boot/compressed/Makefile
      
      Reported-by: default avatarkernelci.org bot <bot@kernelci.org>
      Link: https://storage.kernelci.org/next/next-20161017/mips-gpr_defconfig/build.log
      Signed-off-by: default avatarMatt Redfearn <matt.redfearn@imgtec.com>
      Reviewed-by: default avatarPaul Burton <paul.burton@imgtec.com>
      Cc: linux-mips@linux-mips.org
      Cc: linux-kernel@vger.kernel.org
      Patchwork: https://patchwork.linux-mips.org/patch/14405/
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      818f38c5
    • Matt Redfearn's avatar
      MIPS: generic: Fix KASLR for generic kernel. · 9a59061c
      Matt Redfearn authored
      The KASLR code requires that the plat_get_fdt() function return the
      address of the device tree, and it must be available early in the boot,
      before prom_init() is called. Move the code determining the address of
      the device tree into plat_get_fdt, and call that from prom_init().
      
      The fdt pointer will be set up by plat_get_fdt() called from
      relocate_kernel initially and once the relocated kernel has started,
      prom_init() will use it again to determine the address in the relocated
      image.
      
      Fixes: eed0eabd
      
       ("MIPS: generic: Introduce generic DT-based board support")
      Signed-off-by: default avatarMatt Redfearn <matt.redfearn@imgtec.com>
      Reviewed-by: default avatarJames Hogan <james.hogan@imgtec.com>
      Reviewed-by: default avatarPaul Burton <paul.burton@imgtec.com>
      Cc: linux-mips@linux-mips.org
      Cc: linux-kernel@vger.kernel.org
      Patchwork: https://patchwork.linux-mips.org/patch/14415/
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      9a59061c
    • Matt Redfearn's avatar
      MIPS: KASLR: Fix handling of NULL FDT · 47366979
      Matt Redfearn authored
      If platform code returns a NULL pointer to the FDT, initial_boot_params
      will not get set to a valid pointer and attempting to find the /chosen
      node in it will cause a NULL pointer dereference and the kernel to crash
      immediately on startup - with no output to the console.
      
      Fix this by checking that initial_boot_params is valid before using it.
      
      Fixes: 405bc8fd
      
       ("MIPS: Kernel: Implement KASLR using CONFIG_RELOCATABLE")
      Cc: stable@vger.kernel.org # 4.7+
      Signed-off-by: default avatarMatt Redfearn <matt.redfearn@imgtec.com>
      Cc: linux-mips@linux-mips.org
      Cc: linux-kernel@vger.kernel.org
      Patchwork: https://patchwork.linux-mips.org/patch/14414/
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      47366979
    • Paul Burton's avatar
      MIPS: Malta: Fixup reboot · 93032e31
      Paul Burton authored
      Commit 10b6ea09
      
       ("MIPS: Malta: Use syscon-reboot driver to reboot")
      converted the Malta board to use the generic syscon-reboot driver to
      handle reboots, but incorrectly used the value 0x4d rather than 0x42 as
      the magic to write to the reboot register.
      
      I also incorrectly believed that syscon/regmap would default to native
      endianness, but this isn't the case. Force this by specifying with a
      native-endian property in the devicetree.
      
      Signed-off-by: default avatarPaul Burton <paul.burton@imgtec.com>
      Fixes: 10b6ea09
      
       ("MIPS: Malta: Use syscon-reboot driver to reboot")
      Reported-by: default avatarGuenter Roeck <linux@roeck-us.net>
      Cc: linux-mips@linux-mips.org
      Tested-by: default avatarGuenter Roeck <linux@roeck-us.net>
      Tested-by: default avatarMaciej W. Rozycki <macro@imgtec.com>
      Patchwork: https://patchwork.linux-mips.org/patch/14396/
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      93032e31
    • Paul Burton's avatar
      MIPS: CPC: Provide default mips_cpc_default_phys_base to ignore CPC · 682c1e52
      Paul Burton authored
      
      
      Provide a default implementation of mips_cpc_default_phys_base() which
      simply returns 0, and adjust mips_cpc_phys_base() to allow for
      mips_cpc_default_phys_base() returning 0. This allows kernels which
      include CPC support to be built without platform code & simply ignore
      the CPC if it wasn't already enabled by the bootloader.
      
      This fixes link failures such as the following from generic defconfigs:
      
         arch/mips/built-in.o: In function `mips_cpc_phys_base':
         arch/mips/kernel/mips-cpc.c:47: undefined reference to `mips_cpc_default_phys_base'
      
      [ralf@linux-mips.org: changed prototype for coding style compliance.]
      
      Signed-off-by: default avatarPaul Burton <paul.burton@imgtec.com>
      Reported-by: default avatarkbuild test robot <fengguang.wu@intel.com>
      Cc: linux-mips@linux-mips.org
      Patchwork: https://patchwork.linux-mips.org/patch/14401/
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      682c1e52
  3. Nov 03, 2016
  4. Nov 02, 2016
    • Linus Torvalds's avatar
      Merge tag 'gcc-plugins-v4.9-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux · 577f12c0
      Linus Torvalds authored
      Pull gcc plugin fixes from Kees Cook:
       - make sure required exports from gcc plugins are visible to gcc
       - switch latent_entropy to unsigned long to avoid stack frame bloat
      
      * tag 'gcc-plugins-v4.9-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
        latent_entropy: Fix wrong gcc code generation with 64 bit variables
        gcc-plugins: Export symbols needed by gcc
      577f12c0
    • Linus Torvalds's avatar
      Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost · 04659feb
      Linus Torvalds authored
      Pull virtio updates from Michael Tsirkin:
       "Tests, fixes and cleanups.
      
        Just minor tweaks, there's nothing major in this cycle"
      
      * tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
        virtio_ring: mark vring_dma_dev inline
        virtio/vhost: add Jason to list of maintainers
        virtio_blk: Delete an unnecessary initialisation in init_vq()
        virtio_blk: Use kmalloc_array() in init_vq()
        virtio: remove config.c
        virtio: console: Unlock vqs while freeing buffers
        ringtest: poll for new buffers once before updating event index
        ringtest: commonize implementation of poll_avail/poll_used
        ringtest: use link-time optimization
        virtio: update balloon size in balloon "probe"
        virtio_ring: Make interrupt suppression spec compliant
        virtio_pci: Limit DMA mask to 44 bits for legacy virtio devices
      04659feb
    • Linus Torvalds's avatar
      Merge tag 'vfio-v4.9-rc4' of git://github.com/awilliam/linux-vfio · a75e0032
      Linus Torvalds authored
      Pull VFIO fix from Alex Williamson:
       "SET_IRQS ioctl parameter sanitization (Vlad Tsyrklevich)"
      
      * tag 'vfio-v4.9-rc4' of git://github.com/awilliam/linux-vfio:
        vfio/pci: Fix integer overflows, bitmask check
      a75e0032
  5. Nov 01, 2016
    • Linus Torvalds's avatar
      Merge tag 'spi-fix-v4.9-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi · 0c183d92
      Linus Torvalds authored
      Pull spi fixes from Mark Brown: "A few small fixes for SPI, one core fix
        that only applies in cases where we're handling DT overlays and a
        couple of driver specific fixes:
      
         - Fix handling of error cases when instantiating DT overlays so we
           don't end up just ignoring devices that encountered an error during
           instantiation.
      
         - Avoid reading uninitialized data when handing spurious interrupts
           in the espi driver.
      
         - A driver specific fix for the dspi driver to fix a bad interaction
           with u-boot"
      
      * tag 'spi-fix-v4.9-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
        spi: dspi: clear SPI_SR before enable interrupt
        spi: fsl-espi: avoid processing uninitalized data on error
        spi: mark device nodes only in case of successful instantiation
      0c183d92
    • Kees Cook's avatar
      latent_entropy: Fix wrong gcc code generation with 64 bit variables · 58bea414
      Kees Cook authored
      
      
      The stack frame size could grow too large when the plugin used long long
      on 32-bit architectures when the given function had too many basic blocks.
      
      The gcc warning was:
      
      drivers/pci/hotplug/ibmphp_ebda.c: In function 'ibmphp_access_ebda':
      drivers/pci/hotplug/ibmphp_ebda.c:409:1: warning: the frame size of 1108 bytes is larger than 1024 bytes [-Wframe-larger-than=]
      
      This switches latent_entropy from u64 to unsigned long.
      
      Thanks to PaX Team and Emese Revfy for the patch.
      
      Signed-off-by: default avatarKees Cook <keescook@chromium.org>
      58bea414
    • Kees Cook's avatar
      gcc-plugins: Export symbols needed by gcc · da7389ac
      Kees Cook authored
      
      
      This explicitly exports symbols that gcc expects from plugins.
      
      Based on code from Emese Revfy.
      
      Signed-off-by: default avatarKees Cook <keescook@chromium.org>
      da7389ac
    • Linus Torvalds's avatar
      Merge tag 'regulator-fix-v4.9-rc3' of... · 3f7b55b6
      Linus Torvalds authored
      Merge tag 'regulator-fix-v4.9-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
      
      Pull regulator fix from Mark Brown:
       "Fix ramp_delay warnings for v4.9
      
        A new warning was introduced for missing information about the time
        that regulators take to power on in v4.9. This is in theory a real
        issue but for most practical regulators the communication overhead of
        talking to the device is greater than the ramp time so a lot of
        drivers don't set it and the warning is far too noisy without
        identifying practical issues.
      
        Just remove the warning for now"
      
      * tag 'regulator-fix-v4.9-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
        regulator: core: silence warning: "VDD1: ramp_delay not set"
      3f7b55b6
    • Linus Torvalds's avatar
      Merge tag 'regmap-fix-v4.9-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap · 80a306d6
      Linus Torvalds authored
      Pull regmap fixes from Mark Brown:
       "A couple of small build fixes here, nothing major.
      
        The missing include is triggered in some configurations and the
        renaming of ret is defensive for the benefit of some drivers people
        are in the process of mainlining"
      
      * tag 'regmap-fix-v4.9-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
        regmap: Rename ret variable in regmap_read_poll_timeout
        regmap: include <linux/delay.h> from include/linux/regmap.h
      80a306d6
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security · 6eb3c604
      Linus Torvalds authored
      Pull TPM fix from James Morris.
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
        tpm: remove invalid min length check from tpm_do_selftest()
      6eb3c604
  6. Oct 31, 2016
    • Jarkko Sakkinen's avatar
      tpm: remove invalid min length check from tpm_do_selftest() · befd9965
      Jarkko Sakkinen authored
      Removal of this check was not properly amended to the original commit.
      
      Cc: stable@vger.kernel.org
      Fixes: 0c541332
      
       ("tpm: use tpm_pcr_read_dev() in tpm_do_selftest()")
      Signed-off-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
      Signed-off-by: default avatarJames Morris <james.l.morris@oracle.com>
      befd9965
    • Linus Torvalds's avatar
      Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm · 41ec793d
      Linus Torvalds authored
      Pull ARM fixes from Russell King:
       "A fix for a regression on ARMv4T CPUs, and wiring up the new pkey
        syscalls for ARM"
      
      * 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm:
        ARM: wire up new pkey syscalls
        ARM: fix oops when using older ARMv4T CPUs
      41ec793d
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc · 04ed7d9c
      Linus Torvalds authored
      Pull sparc fixes from David Miller:
       "Several sparc64 bug fixes here:
      
        1) Make the user copy routines on sparc64 return a properly accurate
           residual length when an exception occurs.
      
        2) We can get enormous kernel TLB range flush requests from vmalloc
           unmaps, so handle these more gracefully by doing full flushes
           instead of going page-by-page.
      
        3) Cope properly with negative branch offsets in sparc jump-label
           support, from James Clarke.
      
        4) Some old-style decl GCC warning fixups from Tobias Klauser"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
        sparc64: Handle extremely large kernel TLB range flushes more gracefully.
        sparc64: Fix illegal relative branches in hypervisor patched TLB cross-call code.
        sparc64: Fix instruction count in comment for __hypervisor_flush_tlb_pending.
        sparc64: Handle extremely large kernel TSB range flushes sanely.
        sparc: Handle negative offsets in arch_jump_label_transform
        sparc64: Fix illegal relative branches in hypervisor patched TLB code.
        sparc64: Delete now unused user copy fixup functions.
        sparc64: Delete now unused user copy assembler helpers.
        sparc64: Convert U3copy_{from,to}_user to accurate exception reporting.
        sparc64: Convert NG2copy_{from,to}_user to accurate exception reporting.
        sparc64: Convert NGcopy_{from,to}_user to accurate exception reporting.
        sparc64: Convert NG4copy_{from,to}_user to accurate exception reporting.
        sparc64: Convert U1copy_{from,to}_user to accurate exception reporting.
        sparc64: Convert GENcopy_{from,to}_user to accurate exception reporting.
        sparc64: Convert copy_in_user to accurate exception reporting.
        sparc64: Prepare to move to more saner user copy exception handling.
        sparc64: Delete __ret_efault.
        sparc32: Fix old style declaration GCC warnings
        sparc64: Fix old style declaration GCC warnings
        sparc64: Setup a scheduling domain for highest level cache.
      04ed7d9c