1. 10 9月, 2017 22 次提交
  2. 09 9月, 2017 10 次提交
    • W
      watchdog: Revert "iTCO_wdt: all versions count down twice" · fc61e83a
      Wim Van Sebroeck 提交于
      This reverts commit 1fccb730.
      Reported as Bug 196509 - iTCO_wdt regression reboot before timeout expire
      Signed-off-by: NWim Van Sebroeck <wim@iguana.be>
      fc61e83a
    • L
      Merge tag 'platform-drivers-x86-v4.14-1' of git://git.infradead.org/linux-platform-drivers-x86 · 0e271fd5
      Linus Torvalds 提交于
      Pull x86 platform driver updates from Darren Hart:
       "Several fixes from static analysis and message noise reduction.
        Correct WMI core and related drivers to evaluate instance number 0x0
        in accordance with the documentation. Add intel-telemetry support for
        Gemini Lake. Various individual driver fixes noted below.
      
        dell-wmi:
         - Update dell_wmi_check_descriptor_buffer() to new model
      
        intel-vbtn:
         - reduce unnecessary messages for normal users
         - match power button on press rather than release
      
        intel-hid:
         - reduce unnecessary messages for normal users
      
        thinkpad_acpi:
         - Fix warning about deprecated hwmon_device_register
      
        wmi:
         - Fix check for method instance number
      
        ideapad-laptop:
         - Expose conservation mode switch
      
        intel_pmc_core:
         - Make the driver PCH family agnostic
      
        peaq-wmi:
         - Evaluate wmi method with instance number 0x0
         - silence a static checker warning
      
        mxm-wmi:
         - Evaluate wmi method with instance number 0x0
      
        asus-wmi:
         - Evaluate wmi method with instance number 0x0
      
        intel_scu_ipc:
         - make intel_scu_ipc_pdata_t const
      
        intel_mid_powerbtn:
         - make mid_pb_ddata const
         - fix error return code in mid_pb_probe()
      
        hp-wmi:
         - Remove unused macro helper
         - Correctly determine method id in WMI calls
      
        dell-wmi:
         - Fix driver interface version query
      
        intel_telemetry:
         - remove redundant macro definition
         - Add GLK PSS Event Table
      
        alienware-wmi:
         - fix format string overflow warning
      
        ibm_rtl:
         - remove unnecessary static in ibm_rtl_write()
      
        msi-wmi:
         - remove unnecessary static in msi_wmi_notify()"
      
      * tag 'platform-drivers-x86-v4.14-1' of git://git.infradead.org/linux-platform-drivers-x86: (23 commits)
        platform/x86: dell-wmi: Update dell_wmi_check_descriptor_buffer() to new model
        platform/x86: intel-vbtn: reduce unnecessary messages for normal users
        platform/x86: intel-hid: reduce unnecessary messages for normal users
        platform/x86: thinkpad_acpi: Fix warning about deprecated hwmon_device_register
        platform/x86: wmi: Fix check for method instance number
        platform/x86: ideapad-laptop: Expose conservation mode switch
        platform/x86: intel_pmc_core: Make the driver PCH family agnostic
        platform/x86: peaq-wmi: Evaluate wmi method with instance number 0x0
        platform/x86: mxm-wmi: Evaluate wmi method with instance number 0x0
        platform/x86: asus-wmi: Evaluate wmi method with instance number 0x0
        platform/x86: intel_scu_ipc: make intel_scu_ipc_pdata_t const
        platform/x86: intel_mid_powerbtn: make mid_pb_ddata const
        platform/x86: intel_mid_powerbtn: fix error return code in mid_pb_probe()
        platform/x86: hp-wmi: Remove unused macro helper
        platform/x86: hp-wmi: Correctly determine method id in WMI calls
        platform/x86: intel-vbtn: match power button on press rather than release
        platform/x86: dell-wmi: Fix driver interface version query
        platform/x86: intel_telemetry: remove redundant macro definition
        platform/x86: intel_telemetry: Add GLK PSS Event Table
        platform/x86: alienware-wmi: fix format string overflow warning
        ...
      0e271fd5
    • L
      Merge tag 'arc-4.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc · ee89252b
      Linus Torvalds 提交于
      Pull ARC updates from Vineet Gupta:
      
       - Support for HSDK board hosting a Quad core HS38x4 based SoC running
         @1GHz (and some prerrquisite changes such as ability to scoot the
         kernel code/data from start of memory map etc)
      
       - Quite a few updates for EZChip (Mellanox) platform
      
       - Fixes to fault/exception printing
      
      * tag 'arc-4.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc: (26 commits)
        ARC: Re-enable MMU upon Machine Check exception
        ARC: Show fault information passed to show_kernel_fault_diag()
        ARC: [plat-hsdk] initial port for HSDK board
        ARC: mm: Decouple RAM base address from kernel link address
        ARCv2: IOC: Tighten up the contraints (specifically base / size alignment)
        ARC: [plat-axs103] refactor the DT fudging code
        ARC: [plat-axs103] use clk driver #2: Add core pll node to DT to manage cpu clk
        ARC: [plat-axs103] use clk driver #1: Get rid of platform specific cpu clk setting
        ARCv2: SLC: provide a line based flush routine for debugging
        ARC: Hardcode ARCH_DMA_MINALIGN to max line length we may have
        ARC: [plat-eznps] handle extra aux regs #2: kernel/entry exit
        ARC: [plat-eznps] handle extra aux regs #1: save/restore on context switch
        ARC: [plat-eznps] avoid toggling of DPC register
        ARC: [plat-eznps] Update the init sequence of aux regs per cpu.
        ARC: [plat-eznps] new command line argument for HW scheduler at MTM
        ARC: set boot print log level to PR_INFO
        ARC: [plat-eznps] Handle user memory error same in simulation and silicon
        ARC: [plat-eznps] use schd.wft instruction instead of sleep at idle task
        ARC: create cpu specific version of arch_cpu_idle()
        ARC: [plat-eznps] spinlock aware for MTM
        ...
      ee89252b
    • L
      Merge tag 'pci-v4.14-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci · 0d519f2d
      Linus Torvalds 提交于
      Pull PCI updates from Bjorn Helgaas:
      
       - add enhanced Downstream Port Containment support, which prints more
         details about Root Port Programmed I/O errors (Dongdong Liu)
      
       - add Layerscape ls1088a and ls2088a support (Hou Zhiqiang)
      
       - add MediaTek MT2712 and MT7622 support (Ryder Lee)
      
       - add MediaTek MT2712 and MT7622 MSI support (Honghui Zhang)
      
       - add Qualcom IPQ8074 support (Varadarajan Narayanan)
      
       - add R-Car r8a7743/5 device tree support (Biju Das)
      
       - add Rockchip per-lane PHY support for better power management (Shawn
         Lin)
      
       - fix IRQ mapping for hot-added devices by replacing the
         pci_fixup_irqs() boot-time design with a host bridge hook called at
         probe-time (Lorenzo Pieralisi, Matthew Minter)
      
       - fix race when enabling two devices that results in upstream bridge
         not being enabled correctly (Srinath Mannam)
      
       - fix pciehp power fault infinite loop (Keith Busch)
      
       - fix SHPC bridge MSI hotplug events by enabling bus mastering
         (Aleksandr Bezzubikov)
      
       - fix a VFIO issue by correcting PCIe capability sizes (Alex
         Williamson)
      
       - fix an INTD issue on Xilinx and possibly other drivers by unifying
         INTx IRQ domain support (Paul Burton)
      
       - avoid IOMMU stalls by marking AMD Stoney GPU ATS as broken (Joerg
         Roedel)
      
       - allow APM X-Gene device assignment to guests by adding an ACS quirk
         (Feng Kan)
      
       - fix driver crashes by disabling Extended Tags on Broadcom HT2100
         (Extended Tags support is required for PCIe Receivers but not
         Requesters, and we now enable them by default when Requesters support
         them) (Sinan Kaya)
      
       - fix MSIs for devices that use phantom RIDs for DMA by assuming MSIs
         use the real Requester ID (not a phantom RID) (Robin Murphy)
      
       - prevent assignment of Intel VMD children to guests (which may be
         supported eventually, but isn't yet) by not associating an IOMMU with
         them (Jon Derrick)
      
       - fix Intel VMD suspend/resume by releasing IRQs on suspend (Scott
         Bauer)
      
       - fix a Function-Level Reset issue with Intel 750 NVMe by waiting
         longer (up to 60sec instead of 1sec) for device to become ready
         (Sinan Kaya)
      
       - fix a Function-Level Reset issue on iProc Stingray by working around
         hardware defects in the CRS implementation (Oza Pawandeep)
      
       - fix an issue with Intel NVMe P3700 after an iProc reset by adding a
         delay during shutdown (Oza Pawandeep)
      
       - fix a Microsoft Hyper-V lockdep issue by polling instead of blocking
         in compose_msi_msg() (Stephen Hemminger)
      
       - fix a wireless LAN driver timeout by clearing DesignWare MSI
         interrupt status after it is handled, not before (Faiz Abbas)
      
       - fix DesignWare ATU enable checking (Jisheng Zhang)
      
       - reduce Layerscape dependencies on the bootloader by doing more
         initialization in the driver (Hou Zhiqiang)
      
       - improve Intel VMD performance allowing allocation of more IRQ vectors
         than present CPUs (Keith Busch)
      
       - improve endpoint framework support for initial DMA mask, different
         BAR sizes, configurable page sizes, MSI, test driver, etc (Kishon
         Vijay Abraham I, Stan Drozd)
      
       - rework CRS support to add periodic messages while we poll during
         enumeration and after Function-Level Reset and prepare for possible
         other uses of CRS (Sinan Kaya)
      
       - clean up Root Port AER handling by removing unnecessary code and
         moving error handler methods to struct pcie_port_service_driver
         (Christoph Hellwig)
      
       - clean up error handling paths in various drivers (Bjorn Andersson,
         Fabio Estevam, Gustavo A. R. Silva, Harunobu Kurokawa, Jeffy Chen,
         Lorenzo Pieralisi, Sergei Shtylyov)
      
       - clean up SR-IOV resource handling by disabling VF decoding before
         updating the corresponding resource structs (Gavin Shan)
      
       - clean up DesignWare-based drivers by unifying quirks to update Class
         Code and Interrupt Pin and related handling of write-protected
         registers (Hou Zhiqiang)
      
       - clean up by adding empty generic pcibios_align_resource() and
         pcibios_fixup_bus() and removing empty arch-specific implementations
         (Palmer Dabbelt)
      
       - request exclusive reset control for several drivers to allow cleanup
         elsewhere (Philipp Zabel)
      
       - constify various structures (Arvind Yadav, Bhumika Goyal)
      
       - convert from full_name() to %pOF (Rob Herring)
      
       - remove unused variables from iProc, HiSi, Altera, Keystone (Shawn
         Lin)
      
      * tag 'pci-v4.14-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: (170 commits)
        PCI: xgene: Clean up whitespace
        PCI: xgene: Define XGENE_PCI_EXP_CAP and use generic PCI_EXP_RTCTL offset
        PCI: xgene: Fix platform_get_irq() error handling
        PCI: xilinx-nwl: Fix platform_get_irq() error handling
        PCI: rockchip: Fix platform_get_irq() error handling
        PCI: altera: Fix platform_get_irq() error handling
        PCI: spear13xx: Fix platform_get_irq() error handling
        PCI: artpec6: Fix platform_get_irq() error handling
        PCI: armada8k: Fix platform_get_irq() error handling
        PCI: dra7xx: Fix platform_get_irq() error handling
        PCI: exynos: Fix platform_get_irq() error handling
        PCI: iproc: Clean up whitespace
        PCI: iproc: Rename PCI_EXP_CAP to IPROC_PCI_EXP_CAP
        PCI: iproc: Add 500ms delay during device shutdown
        PCI: Fix typos and whitespace errors
        PCI: Remove unused "res" variable from pci_resource_io()
        PCI: Correct kernel-doc of pci_vpd_srdt_size(), pci_vpd_srdt_tag()
        PCI/AER: Reformat AER register definitions
        iommu/vt-d: Prevent VMD child devices from being remapping targets
        x86/PCI: Use is_vmd() rather than relying on the domain number
        ...
      0d519f2d
    • L
      Merge tag 'kvm-4.14-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm · 0756b7fb
      Linus Torvalds 提交于
      Pull KVM updates from Radim Krčmář:
       "First batch of KVM changes for 4.14
      
        Common:
         - improve heuristic for boosting preempted spinlocks by ignoring
           VCPUs in user mode
      
        ARM:
         - fix for decoding external abort types from guests
      
         - added support for migrating the active priority of interrupts when
           running a GICv2 guest on a GICv3 host
      
         - minor cleanup
      
        PPC:
         - expose storage keys to userspace
      
         - merge kvm-ppc-fixes with a fix that missed 4.13 because of
           vacations
      
         - fixes
      
        s390:
         - merge of kvm/master to avoid conflicts with additional sthyi fixes
      
         - wire up the no-dat enhancements in KVM
      
         - multiple epoch facility (z14 feature)
      
         - Configuration z/Architecture Mode
      
         - more sthyi fixes
      
         - gdb server range checking fix
      
         - small code cleanups
      
        x86:
         - emulate Hyper-V TSC frequency MSRs
      
         - add nested INVPCID
      
         - emulate EPTP switching VMFUNC
      
         - support Virtual GIF
      
         - support 5 level page tables
      
         - speedup nested VM exits by packing byte operations
      
         - speedup MMIO by using hardware provided physical address
      
         - a lot of fixes and cleanups, especially nested"
      
      * tag 'kvm-4.14-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (67 commits)
        KVM: arm/arm64: Support uaccess of GICC_APRn
        KVM: arm/arm64: Extract GICv3 max APRn index calculation
        KVM: arm/arm64: vITS: Drop its_ite->lpi field
        KVM: arm/arm64: vgic: constify seq_operations and file_operations
        KVM: arm/arm64: Fix guest external abort matching
        KVM: PPC: Book3S HV: Fix memory leak in kvm_vm_ioctl_get_htab_fd
        KVM: s390: vsie: cleanup mcck reinjection
        KVM: s390: use WARN_ON_ONCE only for checking
        KVM: s390: guestdbg: fix range check
        KVM: PPC: Book3S HV: Report storage key support to userspace
        KVM: PPC: Book3S HV: Fix case where HDEC is treated as 32-bit on POWER9
        KVM: PPC: Book3S HV: Fix invalid use of register expression
        KVM: PPC: Book3S HV: Fix H_REGISTER_VPA VPA size validation
        KVM: PPC: Book3S HV: Fix setting of storage key in H_ENTER
        KVM: PPC: e500mc: Fix a NULL dereference
        KVM: PPC: e500: Fix some NULL dereferences on error
        KVM: PPC: Book3S HV: Protect updates to spapr_tce_tables list
        KVM: s390: we are always in czam mode
        KVM: s390: expose no-DAT to guest and migration support
        KVM: s390: sthyi: remove invalid guest write access
        ...
      0756b7fb
    • L
      Merge tag 'linux-kselftest-4.14-rc1-update' of... · 6d621897
      Linus Torvalds 提交于
      Merge tag 'linux-kselftest-4.14-rc1-update' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest
      
      Pull kselftest updates from Shuah Khan:
      
       - TAP13 framework API and converting tests to TAP13 continues. A few
         more tests are converted and kselftest common RUN_TESTS in lib.mk is
         enhanced to print TAP13 to cover test shell scripts that won't be
         able to use kselftest API.
      
       - Several fixes to existing tests to not fail in unsupported cases.
         This has been an ongoing work based on the feedback from stable
         release kselftest users.
      
       - A new watchdog test and much needed cleanups to the existing tests
         from Eugeniu Rosca.
      
       - Changes to kselftest common lib.mk framework to make RUN_TESTS a
         function to be called from individual test make files to run stress
         and destructive sub-tests.
      
      * tag 'linux-kselftest-4.14-rc1-update' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest: (41 commits)
        selftests: Enhance kselftest_harness.h to print which assert failed
        selftests: lib.mk: change RUN_TESTS to print messages in TAP13 format
        selftests: change lib.mk RUN_TESTS to take test list as an argument
        selftests: lib.mk: suppress "cd" output from run_tests target
        selftests: kselftest framework: change skip exit code to 0
        selftests/timers: make loop consistent with array size
        selftests: timers: remove rtctest_setdate from run_destructive_tests
        selftests: timers: Fix run_destructive_tests target to handle skipped tests
        kselftests: timers: leap-a-day: Change default arguments to help test runs
        selftests: timers: drop support for !KTEST case
        rtc: rtctest: Improve support detection
        selftests/cpu-hotplug: Skip test when there is only one online cpu
        selftests/cpu-hotplug: exit with failure when test occured unexpected behaviors
        selftests: futex: convert test to use ksft TAP13 framework
        selftests: capabilities: convert error output to TAP13 ksft framework
        selftests: memfd: Align STACK_SIZE for ARM AArch64 system
        selftests: warn if failure is due to lack of executable bit
        selftests: kselftest framework: add error counter
        selftests: capabilities: convert the test to use TAP13 ksft framework
        selftests: capabilities: fix to run Non-root +ia, sgidroot => i test
        ...
      6d621897
    • L
      Merge tag 'trace-v4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace · 42c8e86c
      Linus Torvalds 提交于
      Pull tracing updates from Steven Rostedt:
       "Nothing new in development for this release. These are mostly fixes
        that were found during development of changes for the next merge
        window and fixes that were sent to me late in the last cycle"
      
      * tag 'trace-v4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
        tracing: Apply trace_clock changes to instance max buffer
        tracing: Fix clear of RECORDED_TGID flag when disabling trace event
        tracing: Add barrier to trace_printk() buffer nesting modification
        ftrace: Fix memleak when unregistering dynamic ops when tracing disabled
        ftrace: Fix selftest goto location on error
        ftrace: Zero out ftrace hashes when a module is removed
        tracing: Only have rmmod clear buffers that its events were active in
        ftrace: Fix debug preempt config name in stack_tracer_{en,dis}able
      42c8e86c
    • L
      genksyms: fix gperf removal conversion · 3aea311c
      Linus Torvalds 提交于
      I had stupidly missed one special use of 'is_reserved_word()' when I
      converted the code to avoid gperf.
      
      I had changed that function to return the token ID directly rather than
      a pointer to the token descriptor structure, but that meant that the
      test for "is this a reserved word" changed from checking the return
      value against NULL, to checking that it wasn't negative.
      
      And while I had converted the main token parser over, I missed the
      special case of the typeof phrase handling.  And since our dependency
      chain for genksyms does not include the genksyms program itself
      changing, my kernel rebuild didn't show the problem.
      
      Fixes: bb3290d9 ("Remove gperf usage from toolchain")
      Reported-by: NMasahiro Yamada <yamada.masahiro@socionext.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      3aea311c
    • L
      RDMA/netlink: clean up message validity array initializer · 015a9e66
      Linus Torvalds 提交于
      The fix in the parent made me look at that function, and react to how
      illogical and illegible the array initializer was.
      
      Use named array indexes to make it clearer what is going on, and make
      the initializer not depend silently on the exact index numbers.
      
      [ The initializer now also shows an odd inconsistency in the naming:
        note the IWCM vs IWPM..   - Linus ]
      
      Cc: Leon Romanovsky <leonro@mellanox.com>
      Cc: Doug Ledford <dledford@redhat.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      015a9e66
    • L
      RDAM/netlink: Fix out-of-bound access while checking message validity · 8b2c7e7a
      Leon Romanovsky 提交于
      The netlink message sent with type == 0, which doesn't have any client
      behind it, caused to the overflow in max_num_ops array.
      
      Fix it by declaring zero number of ops for the first client.
      
      Fixes: c9901724 ("RDMA/netlink: Remove netlink clients infrastructure")
      Signed-off-by: NLeon Romanovsky <leon@kernel.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      8b2c7e7a
  3. 08 9月, 2017 8 次提交
    • R
      Merge branch 'kvm-ppc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc · 5f54c8b2
      Radim Krčmář 提交于
      This fix was intended for 4.13, but didn't get in because both
      maintainers were on vacation.
      
      Paul Mackerras:
       "It adds mutual exclusion between list_add_rcu and list_del_rcu calls
        on the kvm->arch.spapr_tce_tables list.  Without this, userspace could
        potentially trigger corruption of the list and cause a host crash or
        worse."
      5f54c8b2
    • L
      Merge branch 'gperf-removal' · 5969d1bb
      Linus Torvalds 提交于
      Remove our use of 'gperf' for generating perfect hashes from some of our
      build tools.
      
      This removal was prompted by Masahiro Yamada sending out a patch that
      removes all our pre-generated files, and when I tested it, I noticed
      that the gperf version I have (3.1) apparently generates code that no
      longer works with out code-base because the function interfaces
      generated by gperf have changed.
      
      We really don't care that much, and the gperf people changed their
      interfaces in ways that makes it annoying to work with them.  Tools that
      make it hard to use them should not be used, and the kernel is not at
      all interested in some autoconf mess.  So remove the gperf dependency
      entirely.
      
      It turns out that if you ignore the pre-generated files, the use of
      gperf apparently saved us a whopping fifteen lines of code.  It
      obviously wasn't worth it, considering that the pre-generated files are
      about 500 lines.
      
      I sent this out as a patch about three weeks ago, and got absolutely
      zero responses.  So let's see if anybody notices now that I merge it.
      Because there might be serious bugs here, but it WorksForMe(tm).
      
      * gperf-removal:
        Remove gperf usage from toolchain
      5969d1bb
    • L
      Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi · 572c01ba
      Linus Torvalds 提交于
      Pull SCSI updates from James Bottomley:
       "This is mostly updates of the usual suspects: lpfc, qla2xxx, hisi_sas,
        megaraid_sas, zfcp and a host of minor updates.
      
        The major driver change here is the elimination of the block based
        cciss driver in favour of the SCSI based hpsa driver (which now drives
        all the legacy cases cciss used to be required for). Plus a reset
        handler clean up and the redo of the SAS SMP handler to use bsg lib"
      
      * tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (279 commits)
        scsi: scsi-mq: Always unprepare before requeuing a request
        scsi: Show .retries and .jiffies_at_alloc in debugfs
        scsi: Improve requeuing behavior
        scsi: Call scsi_initialize_rq() for filesystem requests
        scsi: qla2xxx: Reset the logo flag, after target re-login.
        scsi: qla2xxx: Fix slow mem alloc behind lock
        scsi: qla2xxx: Clear fc4f_nvme flag
        scsi: qla2xxx: add missing includes for qla_isr
        scsi: qla2xxx: Fix an integer overflow in sysfs code
        scsi: aacraid: report -ENOMEM to upper layer from aac_convert_sgraw2()
        scsi: aacraid: get rid of one level of indentation
        scsi: aacraid: fix indentation errors
        scsi: storvsc: fix memory leak on ring buffer busy
        scsi: scsi_transport_sas: switch to bsg-lib for SMP passthrough
        scsi: smartpqi: remove the smp_handler stub
        scsi: hpsa: remove the smp_handler stub
        scsi: bsg-lib: pass the release callback through bsg_setup_queue
        scsi: Rework handling of scsi_device.vpd_pg8[03]
        scsi: Rework the code for caching Vital Product Data (VPD)
        scsi: rcu: Introduce rcu_swap_protected()
        ...
      572c01ba
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/pmladek/printk · cef5d0f9
      Linus Torvalds 提交于
      Pull printk updates from Petr Mladek:
      
       - Do not allow use of freed init data and code even when boot consoles
         are forced to stay. Also check for the init memory more precisely.
      
       - Some code clean up by starting contributors.
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/pmladek/printk:
        printk: Clean up do_syslog() error handling
        printk/console: Enhance the check for consoles using init memory
        printk/console: Always disable boot consoles that use init memory before it is freed
        printk: Modify operators of printed_len and text_len
      cef5d0f9
    • L
      Merge tag 'audit-pr-20170907' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit · 0fb02e71
      Linus Torvalds 提交于
      Pull audit updates from Paul Moore:
       "A small pull request for audit this time, only four patches and only
        two with any real code changes.
      
        Those two changes are the removal of a pointless SELinux AVC
        initialization audit event and a fix to improve the audit timestamp
        overhead.
      
        The other two patches are comment cleanup and administrative updates,
        nothing very exciting.
      
        Everything passes our tests"
      
      * tag 'audit-pr-20170907' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit:
        audit: update the function comments
        selinux: remove AVC init audit log message
        audit: update the audit info in MAINTAINERS
        audit: Reduce overhead using a coarse clock
      0fb02e71
    • L
      Merge tag 'secureexec-v4.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux · 828f4257
      Linus Torvalds 提交于
      Pull secureexec update from Kees Cook:
       "This series has the ultimate goal of providing a sane stack rlimit
        when running set*id processes.
      
        To do this, the bprm_secureexec LSM hook is collapsed into the
        bprm_set_creds hook so the secureexec-ness of an exec can be
        determined early enough to make decisions about rlimits and the
        resulting memory layouts. Other logic acting on the secureexec-ness of
        an exec is similarly consolidated. Capabilities needed some special
        handling, but the refactoring removed other special handling, so that
        was a wash"
      
      * tag 'secureexec-v4.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
        exec: Consolidate pdeath_signal clearing
        exec: Use sane stack rlimit under secureexec
        exec: Consolidate dumpability logic
        smack: Remove redundant pdeath_signal clearing
        exec: Use secureexec for clearing pdeath_signal
        exec: Use secureexec for setting dumpability
        LSM: drop bprm_secureexec hook
        commoncap: Move cap_elevated calculation into bprm_set_creds
        commoncap: Refactor to remove bprm_secureexec hook
        smack: Refactor to remove bprm_secureexec hook
        selinux: Refactor to remove bprm_secureexec hook
        apparmor: Refactor to remove bprm_secureexec hook
        binfmt: Introduce secureexec flag
        exec: Correct comments about "point of no return"
        exec: Rename bprm->cred_prepared to called_set_creds
      828f4257
    • L
      Merge tag 'gcc-plugins-v4.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux · 44ccba3f
      Linus Torvalds 提交于
      Pull gcc plugins update from Kees Cook:
       "This finishes the porting work on randstruct, and introduces a new
        option to structleak, both noted below:
      
         - For the randstruct plugin, enable automatic randomization of
           structures that are entirely function pointers (along with a couple
           designated initializer fixes).
      
         - For the structleak plugin, provide an option to perform zeroing
           initialization of all otherwise uninitialized stack variables that
           are passed by reference (Ard Biesheuvel)"
      
      * tag 'gcc-plugins-v4.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
        gcc-plugins: structleak: add option to init all vars used as byref args
        randstruct: Enable function pointer struct detection
        drivers/net/wan/z85230.c: Use designated initializers
        drm/amd/powerplay: rv: Use designated initializers
      44ccba3f
    • L
      Merge tag 'pstore-v4.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux · 21d236bf
      Linus Torvalds 提交于
      Pull pstore update from Kees Cook:
       "Make pstore permissions more versatile by removing CAP_SYSLOG
        requirement and defining more restrictive root directory DAC
        permissions default (0750, which can be adjust after boot unlike the
        CAP_SYSLOG check).
      
        Suggested by Nick Kralevich"
      
      * tag 'pstore-v4.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
        Revert "pstore: Honor dmesg_restrict sysctl on dmesg dumps"
        pstore: Make default pstorefs root dir perms 0750
      21d236bf