]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
media: msi2500: assign SPI bus number dynamically
authorAntti Palosaari <crope@iki.fi>
Sat, 17 Aug 2019 01:12:10 +0000 (03:12 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 29 Dec 2020 12:42:34 +0000 (13:42 +0100)
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 <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/media/usb/msi2500/msi2500.c

index e06a21a4fbd9a30bdb3c86f4cfb41f9de3833ddd..322238d9aa713c3c31531a3228dbfeb5569719cd 100644 (file)
@@ -1254,7 +1254,7 @@ static int msi2500_probe(struct usb_interface *intf,
        }
 
        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);