1. 25 May, 2019 2 commits
    • Gen Zhang's avatar
      efi/x86/Add missing error handling to old_memmap 1:1 mapping code · 4e78921b
      Gen Zhang authored
      The old_memmap flow in efi_call_phys_prolog() performs numerous memory
      allocations, and either does not check for failure at all, or it does
      but fails to propagate it back to the caller, which may end up calling
      into the firmware with an incomplete 1:1 mapping.
      
      So let's fix this by returning NULL from efi_call_phys_prolog() on
      memory allocation failures only, and by handling this condition in the
      caller. Also, clean up any half baked sets of page tables that we may
      have created before returning with a NULL return value.
      
      Note that any failure at this level will trigger a panic() two levels
      up, so none of this makes a huge difference, but it is a nice cleanup
      nonetheless.
      
      [ardb: update commit log, add efi_call_phys_epilog() call on error path]
      Signed-off-by: default avatarGen Zhang <blackgod016574@gmail.com>
      Signed-off-by: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
      Cc: Linus Torvalds <torvalds@linux-foundation.org>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Rob Bradford <robert.bradford@intel.com>
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Cc: linux-efi@vger.kernel.org
      Link: http://lkml.kernel.org/r/20190525112559.7917-2-ard.biesheuvel@linaro.orgSigned-off-by: default avatarIngo Molnar <mingo@kernel.org>
      4e78921b
    • Linus Torvalds's avatar
      Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi · 2409207a
      Linus Torvalds authored
      Pull SCSI fixes from James Bottomley:
       "This is the same set of patches sent in the merge window as the final
        pull except that Martin's read only rework is replaced with a simple
        revert of the original change that caused the regression.
      
        Everything else is an obvious fix or small cleanup"
      
      * tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
        Revert "scsi: sd: Keep disk read-only when re-reading partition"
        scsi: bnx2fc: fix incorrect cast to u64 on shift operation
        scsi: smartpqi: Reporting unhandled SCSI errors
        scsi: myrs: Fix uninitialized variable
        scsi: lpfc: Update lpfc version to 12.2.0.2
        scsi: lpfc: add check for loss of ndlp when sending RRQ
        scsi: lpfc: correct rcu unlock issue in lpfc_nvme_info_show
        scsi: lpfc: resolve lockdep warnings
        scsi: qedi: remove set but not used variables 'cdev' and 'udev'
        scsi: qedi: remove memset/memcpy to nfunc and use func instead
        scsi: qla2xxx: Add cleanup for PCI EEH recovery
      2409207a
  2. 24 May, 2019 38 commits