1. 17 5月, 2016 1 次提交
    • A
      Merge branch 'ovl-fixes' into for-linus · 0e0162bb
      Al Viro 提交于
      Backmerge to resolve a conflict in ovl_lookup_real();
      "ovl_lookup_real(): use lookup_one_len_unlocked()" instead,
      but it was too late in the cycle to rebase.
      0e0162bb
  2. 13 5月, 2016 7 次提交
  3. 11 5月, 2016 8 次提交
  4. 10 5月, 2016 1 次提交
  5. 09 5月, 2016 14 次提交
  6. 08 5月, 2016 4 次提交
    • A
      get_rock_ridge_filename(): handle malformed NM entries · 99d82582
      Al Viro 提交于
      Payloads of NM entries are not supposed to contain NUL.  When we run
      into such, only the part prior to the first NUL goes into the
      concatenation (i.e. the directory entry name being encoded by a bunch
      of NM entries).  We do stop when the amount collected so far + the
      claimed amount in the current NM entry exceed 254.  So far, so good,
      but what we return as the total length is the sum of *claimed*
      sizes, not the actual amount collected.  And that can grow pretty
      large - not unlimited, since you'd need to put CE entries in
      between to be able to get more than the maximum that could be
      contained in one isofs directory entry / continuation chunk and
      we are stop once we'd encountered 32 CEs, but you can get about 8Kb
      easily.  And that's what will be passed to readdir callback as the
      name length.  8Kb __copy_to_user() from a buffer allocated by
      __get_free_page()
      
      Cc: stable@vger.kernel.org # 0.98pl6+ (yes, really)
      Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
      99d82582
    • L
      Merge tag 'char-misc-4.6-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc · 32cf95db
      Linus Torvalds 提交于
      Pull misc driver fixes from Gfreg KH:
       "Here are three small fixes for some driver problems that were
        reported.  Full details in the shortlog below.
      
        All of these have been in linux-next with no reported issues"
      
      * tag 'char-misc-4.6-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
        nvmem: mxs-ocotp: fix buffer overflow in read
        Drivers: hv: vmbus: Fix signaling logic in hv_need_to_signal_on_read()
        misc: mic: Fix for double fetch security bug in VOP driver
      32cf95db
    • L
      Merge tag 'staging-4.6-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging · 630aac5a
      Linus Torvalds 提交于
      Pull IIO driver fixes from Grek KH:
       "It's really just IIO drivers here, some small fixes that resolve some
        'crash on boot' errors that have shown up in the -rc series, and other
        bugfixes that are required.
      
        All have been in linux-next with no reported problems"
      
      * tag 'staging-4.6-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
        iio: imu: mpu6050: Fix name/chip_id when using ACPI
        iio: imu: mpu6050: fix possible NULL dereferences
        iio:adc:at91-sama5d2: Repair crash on module removal
        iio: ak8975: fix maybe-uninitialized warning
        iio: ak8975: Fix NULL pointer exception on early interrupt
      630aac5a
    • L
      Merge tag 'usb-4.6-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb · 3f8f0cf2
      Linus Torvalds 提交于
      Pull USB fixes from Greg KH:
       "Here are some last-remaining fixes for USB drivers to resolve issues
        that have shown up in testing.  And two new device ids as well.
      
        All of these have been in linux-next with no reported issues"
      
      * tag 'usb-4.6-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
        Revert "USB / PM: Allow USB devices to remain runtime-suspended when sleeping"
        usb: musb: jz4740: fix error check of usb_get_phy()
        Revert "usb: musb: musb_host: Enable HCD_BH flag to handle urb return in bottom half"
        usb: musb: gadget: nuke endpoint before setting its descriptor to NULL
        USB: serial: cp210x: add Straizona Focusers device ids
        USB: serial: cp210x: add ID for Link ECU
      3f8f0cf2
  7. 07 5月, 2016 5 次提交