From: Greg Kroah-Hartman Date: Wed, 23 Dec 2020 15:00:33 +0000 (+0100) Subject: 4.4-stable patches X-Git-Tag: v5.10.3~10 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1b055972e27b5d5e6bfa89067e343963ba2d91d0;p=thirdparty%2Fkernel%2Fstable-queue.git 4.4-stable patches added patches: media-msi2500-assign-spi-bus-number-dynamically.patch --- diff --git a/queue-4.4/media-msi2500-assign-spi-bus-number-dynamically.patch b/queue-4.4/media-msi2500-assign-spi-bus-number-dynamically.patch new file mode 100644 index 00000000000..252e27f9148 --- /dev/null +++ b/queue-4.4/media-msi2500-assign-spi-bus-number-dynamically.patch @@ -0,0 +1,34 @@ +From 9c60cc797cf72e95bb39f32316e9f0e5f85435f9 Mon Sep 17 00:00:00 2001 +From: Antti Palosaari +Date: Sat, 17 Aug 2019 03:12:10 +0200 +Subject: media: msi2500: assign SPI bus number dynamically + +From: Antti Palosaari + +commit 9c60cc797cf72e95bb39f32316e9f0e5f85435f9 upstream. + +SPI bus number must be assigned dynamically for each device, otherwise it +will crash when multiple devices are plugged to system. + +Reported-and-tested-by: syzbot+c60ddb60b685777d9d59@syzkaller.appspotmail.com + +Cc: stable@vger.kernel.org +Signed-off-by: Antti Palosaari +Signed-off-by: Mauro Carvalho Chehab +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/media/usb/msi2500/msi2500.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/media/usb/msi2500/msi2500.c ++++ b/drivers/media/usb/msi2500/msi2500.c +@@ -1254,7 +1254,7 @@ static int msi2500_probe(struct usb_inte + } + + dev->master = master; +- master->bus_num = 0; ++ master->bus_num = -1; + master->num_chipselect = 1; + master->transfer_one_message = msi2500_transfer_one_message; + spi_master_set_devdata(master, dev); diff --git a/queue-4.4/series b/queue-4.4/series index a94569c8c35..799fb5e78f6 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -27,3 +27,4 @@ soc-tegra-fuse-fix-index-bug-in-get_process_id.patch usb-serial-option-add-interface-number-sanity-check-to-flag-handling.patch usb-gadget-f_rndis-fix-bitrate-for-superspeed-and-above.patch usb-chipidea-ci_hdrc_imx-pass-disable_device_streaming-flag-to-imx6ul.patch +media-msi2500-assign-spi-bus-number-dynamically.patch