History

Merge tag 'staging-5.7-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging

Pull staging driver fixes from Greg KH: "Here are three small driver fixes for 5.7-rc5. Two of these are documentation fixes: - MAINTAINERS update due to removed driver - removing Wolfram from the ks7010 driver TODO file The other patch is a real fix: - fix gasket driver to proper check the return value of a call All of these have been in linux-next for a while with no reported issues" * tag 'staging-5.7-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: staging: gasket: Check the return value of gasket_get_bar_index() staging: ks7010: remove me from CC list MAINTAINERS: remove entry after hp100 driver removal

Linus Torvalds committed 6 years ago

Commit e7a1c732 parents cbd0e48 769acc33 files · +4 −6Browse files

Unified · Split

3 files
  1. MAINTAINERS +0 −5
  2. drivers/staging/gasket/gasket_core.c +4 −0
  3. drivers/staging/ks7010/TODO +0 −1
MAINTAINERS+0−5
@@ -7746,11 +7746,6 @@ L: platform-driver-x86@vger.kernel.org · 7745 unmodified lines
77467746 S: Orphan
77477747 F: drivers/platform/x86/tc1100-wmi.c
77487748
7749−HP100: Driver for HP 10/100 Mbit/s Voice Grade Network Adapter Series
7750−M: Jaroslav Kysela <perex@perex.cz>
7751−S: Obsolete
7752−F: drivers/staging/hp/hp100.*
7753−
77547749 HPET: High Precision Event Timers driver
77557750 M: Clemens Ladisch <clemens@ladisch.de>
77567751 S: Maintained
drivers/staging/gasket/gasket_core.c+4−0
@@ -925,6 +925,10 @@ do_map_region(const struct gasket_dev *gasket_dev, struct vm_area_struct *vma, · 924 unmodified lines
925925 gasket_get_bar_index(gasket_dev,
926926 (vma->vm_pgoff << PAGE_SHIFT) +
927927 driver_desc->legacy_mmap_address_offset);
928+
929+ if (bar_index < 0)
930+ return DO_MAP_REGION_INVALID;
931+
928932 phys_base = gasket_dev->bar_data[bar_index].phys_base + phys_offset;
929933 while (mapped_bytes < map_length) {
930934 /*
drivers/staging/ks7010/TODO+0−1
@@ -30,5 +30,4 @@ Now the TODOs: · 29 unmodified lines
3030
3131 Please send any patches to:
3232 Greg Kroah-Hartman <gregkh@linuxfoundation.org>
33−Wolfram Sang <wsa@the-dreams.de>
3433 Linux Driver Project Developer List <driverdev-devel@linuxdriverproject.org>