aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-02-18 19:39:29 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-02-18 19:39:29 +0100
commit8b978be8d067f58b29cbbf0579e88bb4a2d4350a (patch)
treefb2a32fbf08db3477c0935cf16b5ca720a5aef5f
parentbab5417f5f0118ce914bc5b2f8381e959e891155 (diff)
parentda0f3e0201b87ee4bbd2175925dd57e1228c35fb (diff)
downloaddevel-8b978be8d067f58b29cbbf0579e88bb4a2d4350a.tar.gz
Merge tag 'thunderbolt-fix-for-v5.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt into usb-linus
Mika writes: thunderbolt: Fix for v5.6-rc3 Single fix that orders the THUNDERBOLT MAINTAINERS record according to parse-maintainers.pl. * tag 'thunderbolt-fix-for-v5.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt: MAINTAINERS: Sort entries in database for THUNDERBOLT
Diffstat
-rw-r--r--MAINTAINERS2
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 1277cf33d4130..bfb9590ae3dd2 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -16552,8 +16552,8 @@ M: Michael Jamet <michael.jamet@intel.com>
M: Mika Westerberg <mika.westerberg@linux.intel.com>
M: Yehezkel Bernat <YehezkelShB@gmail.com>
L: linux-usb@vger.kernel.org
-T: git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git
S: Maintained
+T: git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git
F: Documentation/admin-guide/thunderbolt.rst
F: drivers/thunderbolt/
F: include/linux/thunderbolt.h
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-05-22 05:10:01 +0000
ary='commit info' class='commit-info'> authorLukas Wunner <lukas@wunner.de>2021-05-22 19:49:50 +0200 committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-06-16 12:05:05 +0200 commit01415ff85a24308059e06ca3e97fd7bf75648690 (patch) tree8ecc98d1700f1a119cb88ef1a38554692d079d62 parentb7886783b01b5637a42a8dd813152e724c982804 (diff)downloadlinux-01415ff85a24308059e06ca3e97fd7bf75648690.tar.gz
spi: bcm2835: Fix out-of-bounds access with more than 4 slaves
commit 13817d466eb8713a1ffd254f537402f091d48444 upstream. Commit 571e31fa60b3 ("spi: bcm2835: Cache CS register value for ->prepare_message()") limited the number of slaves to 3 at compile-time. The limitation was necessitated by a statically-sized array prepare_cs[] in the driver private data which contains a per-slave register value. The commit sought to enforce the limitation at run-time by setting the controller's num_chipselect to 3: Slaves with a higher chipselect are rejected by spi_add_device(). However the commit neglected that num_chipselect only limits the number of *native* chipselects. If GPIO chipselects are specified in the device tree for more than 3 slaves, num_chipselect is silently raised by of_spi_get_gpio_numbers() and the result are out-of-bounds accesses to the statically-sized array prepare_cs[]. As a bandaid fix which is backportable to stable, raise the number of allowed slaves to 24 (which "ought to be enough for anybody"), enforce the limitation on slave ->setup and revert num_chipselect to 3 (which is the number of native chipselects supported by the controller). An upcoming for-next commit will allow an arbitrary number of slaves. Fixes: 571e31fa60b3 ("spi: bcm2835: Cache CS register value for ->prepare_message()") Reported-by: Joe Burmeister <joe.burmeister@devtank.co.uk> Signed-off-by: Lukas Wunner <lukas@wunner.de> Cc: stable@vger.kernel.org # v5.4+ Cc: Phil Elwell <phil@raspberrypi.com> Link: https://lore.kernel.org/r/75854affc1923309fde05e47494263bde73e5592.1621703210.git.lukas@wunner.de Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>