1. 16 6月, 2017 5 次提交
    • L
      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma · 51ce5f33
      Linus Torvalds 提交于
      Pull rdma fixes from Doug Ledford:
      
       "I had thought at the time of the last pull request that there wouldn't
        be much more to go, but several things just kept trickling in over the
        last week.
      
        Instead of just the six patches to bnxt_re that I had anticipated,
        there are another five IPoIB patches, two qedr patches, and a few
        other miscellaneous patches.
      
        The bnxt_re patches are more lines of diff than I like to submit this
        late in the game. That's mostly because of the first two patches in
        the series of six. I almost dropped them just because of the lines of
        churn, but on a close review, a lot of the churn came from removing
        duplicated code sections and consolidating them into callable
        routines. I felt like this made the number of lines of change more
        acceptable, and they address problems, so I left them. The remainder
        of the patches are all small, well contained, and well understood.
      
        These have passed 0day testing, but have not been submitted to
        linux-next (but a local merge test with your current master was
        without any conflicts).
      
        Summary:
      
         - A fix for fix eea40b8f ("infiniband: call ipv6 route lookup via
           the stub interface")
      
         - Six patches against bnxt_re...the first two are considerably larger
           than I would like, but as they address real issues I went ahead and
           submitted them (it also helped that a good deal of the churn was
           removing code repeated in multiple places and consolidating it to
           one common function)
      
         - Two fixes against qedr that just came in
      
         - One fix against rxe that took a few revisions to get right plus
           time to get the proper reviews
      
         - Five late breaking IPoIB fixes
      
         - One late cxgb4 fix"
      
      * tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma:
        rdma/cxgb4: Fix memory leaks during module exit
        IB/ipoib: Fix memory leak in create child syscall
        IB/ipoib: Fix access to un-initialized napi struct
        IB/ipoib: Delete napi in device uninit default
        IB/ipoib: Limit call to free rdma_netdev for capable devices
        IB/ipoib: Fix memory leaks for child interfaces priv
        rxe: Fix a sleep-in-atomic bug in post_one_send
        RDMA/qedr: Add 64KB PAGE_SIZE support to user-space queues
        RDMA/qedr: Initialize byte_len in WC of READ and SEND commands
        RDMA/bnxt_re: Remove FMR support
        RDMA/bnxt_re: Fix RQE posting logic
        RDMA/bnxt_re: Add HW workaround for avoiding stall for UD QPs
        RDMA/bnxt_re: Dereg MR in FW before freeing the fast_reg_page_list
        RDMA/bnxt_re: HW workarounds for handling specific conditions
        RDMA/bnxt_re: Fixing the Control path command and response handling
        IB/addr: Fix setting source address in addr6_resolve()
      51ce5f33
    • L
      Merge tag 'platform-drivers-x86-v4.12-2' of git://git.infradead.org/linux-platform-drivers-x86 · f69d64de
      Linus Torvalds 提交于
      Pull x86 platform driver fix from Darren Hart:
       "Just a single patch to fix an oops in the intel_telemetry_debugfs
        module load/unload"
      
      * tag 'platform-drivers-x86-v4.12-2' of git://git.infradead.org/linux-platform-drivers-x86:
        platform/x86: intel_telemetry_debugfs: fix oops when load/unload module
      f69d64de
    • L
      Merge branch 'for-linus' of git://git.kernel.dk/linux-block · e78e4626
      Linus Torvalds 提交于
      Pull block layer fix from Jens Axboe:
       "Just a single fix this week, fixing a regression introduced in this
        release.
      
        When we put the final reference to the queue, we may need to block.
        Ensure that we can safely do so. From Bart"
      
      * 'for-linus' of git://git.kernel.dk/linux-block:
        block: Fix a blk_exit_rl() regression
      e78e4626
    • L
      Merge branch 'dmi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging · cbfb7497
      Linus Torvalds 提交于
      Pull dmi fixes from Jean Delvare.
      
      * 'dmi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
        firmware: dmi_scan: Check DMI structure length
        firmware: dmi: Fix permissions of product_family
        firmware: dmi_scan: Make dmi_walk and dmi_walk_early return real error codes
        firmware: dmi_scan: Look for SMBIOS 3 entry point first
      cbfb7497
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security · 550ad8ef
      Linus Torvalds 提交于
      Pull selinux fix from James Morris:
       "Fix for a double free bug in SELinux"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
        selinux: fix double free in selinux_parse_opts_str()
      550ad8ef
  2. 15 6月, 2017 32 次提交
  3. 14 6月, 2017 3 次提交
    • M
      caif: Add sockaddr length check before accessing sa_family in connect handler · 20a3d5bf
      Mateusz Jurczyk 提交于
      Verify that the caller-provided sockaddr structure is large enough to
      contain the sa_family field, before accessing it in the connect()
      handler of the AF_CAIF socket. Since the syscall doesn't enforce a minimum
      size of the corresponding memory region, very short sockaddrs (zero or one
      byte long) result in operating on uninitialized memory while referencing
      sa_family.
      Signed-off-by: NMateusz Jurczyk <mjurczyk@google.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      20a3d5bf
    • D
      RDMA/bnxt_re: Fixing the Control path command and response handling · cc1ec769
      Devesh Sharma 提交于
      Fixing a concurrency issue with creq handling. Each caller
      was given a globally managed crsq element, which was
      accessed outside a lock. This could result in corruption,
      if lot of applications are simultaneously issuing Control Path
      commands. Now, each caller will provide its own response buffer
      and the responses will be copied under a lock.
      Also, Fixing the queue full condition check for the CMDQ.
      
      As a part of these changes, the control path code is refactored
      to remove the code replication in the response status checking.
      Signed-off-by: NDevesh Sharma <devesh.sharma@broadcom.com>
      Signed-off-by: NSelvin Xavier <selvin.xavier@broadcom.com>
      Signed-off-by: NDoug Ledford <dledford@redhat.com>
      cc1ec769
    • P
      platform/x86: intel_telemetry_debugfs: fix oops when load/unload module · bf5d0081
      Priyalee Kushwaha 提交于
      This fixes an oops found while testing load/unload of the
      intel_telemetry_debugfs module. module_init uses register_pm_notifier
      for PM callbacks, but unregister_pm_notifier was missing from
      module_exit.
      
       [ 97.481860] BUG: unable to handle kernel paging request at ffffffffa006f010
       [ 97.489742] IP: blocking_notifier_chain_register+0x3a/0xa0
       [ 97.495898] PGD 2e0a067
       [ 97.495899] PUD 2e0b063
       [ 97.498737] PMD 179e29067
       [ 97.501573] PTE 0
      
       [ 97.508423] Oops: 0000 1 PREEMPT SMP
       [ 97.512724] Modules linked in: intel_telemetry_debugfs intel_rapl gpio_keys dwc3 udc_core intel_telemetry_pltdrv intel_punit_ipc intel_telemetry_core rtc_cmos efivars x86_pkg_temp_thermal iwlwifi snd_hda_codec_hdmi soc_button_array btusb cfg80211 btrtl mei_me hci_uart btbcm mei btintel i915 bluetooth intel_pmc_ipc snd_hda_intel spi_pxa2xx_platform snd_hda_codec dwc3_pci snd_hda_core tpm_tis tpm_tis_core tpm efivarfs
       [ 97.558453] CPU: 0 PID: 889 Comm: modprobe Not tainted 4.11.0-rc6-intel-dev-bkc #1
       [ 97.566950] Hardware name: Intel Corp. Joule DVT3/SDS, BIOS GTPP181A.X64.0143.B30.1701132137 01/13/2017
       [ 97.577518] task: ffff8801793a21c0 task.stack: ffff8801793f0000
       [ 97.584162] RIP: 0010:blocking_notifier_chain_register+0x3a/0xa0
       [ 97.590903] RSP: 0018:ffff8801793f3c58 EFLAGS: 00010286
       [ 97.596802] RAX: ffffffffa006f000 RBX: ffffffff81e3ea20 RCX: 0000000000000000
       [ 97.604812] RDX: ffff880179eaf210 RSI: ffffffffa0131000 RDI: ffffffff81e3ea20
       [ 97.612821] RBP: ffff8801793f3c68 R08: 0000000000000006 R09: 000000000000005c
       [ 97.620847] R10: 0000000000000000 R11: 0000000000000006 R12: ffffffffa0131000
       [ 97.628855] R13: 0000000000000000 R14: ffff880176e35f48 R15: ffff8801793f3ea8
       [ 97.636865] FS: 00007f7eeba07700(0000) GS:ffff88017fc00000(0000) knlGS:0000000000000000
       [ 97.645948] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
       [ 97.652423] CR2: ffffffffa006f010 CR3: 00000001775ef000 CR4: 00000000003406f0
       [ 97.660423] Call Trace:
       [ 97.663166] ? 0xffffffffa0031000
       [ 97.666885] register_pm_notifier+0x18/0x20
       [ 97.671581] telemetry_debugfs_init+0x92/0x1000
      Signed-off-by: NPriyalee Kushwaha <priyalee.kushwaha@intel.com>
      Signed-off-by: NAndy Shevchenko <andriy.shevchenko@linux.intel.com>
      Signed-off-by: NDarren Hart (VMware) <dvhart@infradead.org>
      bf5d0081