From: Joe Burmeister <joe.burmeister@devtank.co.uk> To: Florian Fainelli <f.fainelli@gmail.com>, Mark Brown <broonie@kernel.org>, Ray Jui <rjui@broadcom.com>, Scott Branden <sbranden@broadcom.com>, bcm-kernel-feedback-list@broadcom.com, Nicolas Saenz Julienne <nsaenzjulienne@suse.de>, linux-spi@vger.kernel.org, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] spi: bcm2835: Fix buffer overflow with CS able to go beyond limit. Date: Thu, 22 Apr 2021 21:10:21 +0100 [thread overview] Message-ID: <7c9f9376-1a80-b624-7b9e-0f6d04437c02@devtank.co.uk> (raw) In-Reply-To: <c087ba2c-7839-02d1-a522-b104d8ffb8d2@gmail.com> > On 4/20/2021 1:34 AM, Joe Burmeister wrote: >> It was previoulsy possible to have a device tree with more chips than >> the driver supports and go off the end of CS arrays. > Do you mind walking me through the code how that could have happened? We > have spi_register_controller() call of_spi_get_gpio_numbers() which has > the following: > > ctlr->num_chipselect = max_t(int, nb, ctlr->num_chipselect); > > such that what the controller has is the maximum between the number of > 'cs-gpios' properties parsed and what was already populated in > ctrl->num_chipselect during bcm2835_spi_probe(), which for this driver > is BCM2835_SPI_NUM_CS (3). If you make a initial device tree (or add overlay in the rpi's config.txt) with more on the bus than BCM2835_SPI_NUM_CS (in my case 8 devices), you get into this trampling memory state. As the devices are added, once the chip_select is equal to or greater than BCM2835_SPI_NUM_CS, it's writing off the end of the arrays. There is no protection from this happening. By the looks of it, this isn't the only driver this could happen with, but it is the one I have hardware for to test. There are also drivers that look like they don't have a problem going well beyond the limit they gave. There is protection in spi_add_device, which will catch extra added later, but not ones in the device tree when the spi controller was registered. >> This patches inforces CS limit but sets that limit to the max of the >> default limit and what is in the device tree when driver is loaded. >> >> Signed-off-by: Joe Burmeister <joe.burmeister@devtank.co.uk> > You have changed many more things that just enforcing a limit on > BCM2835_SPI_NUM_CS you have now made all chip-select related data > structuresd dynamically allocated and you have changed a number of > prints to use the shorthand "dev" instead of &pdev->dev. The change to dynamic allocated arrays is just to support what is given in the device tree rather than increase and enforce the CS limit just for my case. The shorthand is of course not required. I'll drop it on resubmitting. Regards, Joe
WARNING: multiple messages have this Message-ID (diff)
From: Joe Burmeister <joe.burmeister@devtank.co.uk> To: Florian Fainelli <f.fainelli@gmail.com>, Mark Brown <broonie@kernel.org>, Ray Jui <rjui@broadcom.com>, Scott Branden <sbranden@broadcom.com>, bcm-kernel-feedback-list@broadcom.com, Nicolas Saenz Julienne <nsaenzjulienne@suse.de>, linux-spi@vger.kernel.org, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] spi: bcm2835: Fix buffer overflow with CS able to go beyond limit. Date: Thu, 22 Apr 2021 21:10:21 +0100 [thread overview] Message-ID: <7c9f9376-1a80-b624-7b9e-0f6d04437c02@devtank.co.uk> (raw) In-Reply-To: <c087ba2c-7839-02d1-a522-b104d8ffb8d2@gmail.com> > On 4/20/2021 1:34 AM, Joe Burmeister wrote: >> It was previoulsy possible to have a device tree with more chips than >> the driver supports and go off the end of CS arrays. > Do you mind walking me through the code how that could have happened? We > have spi_register_controller() call of_spi_get_gpio_numbers() which has > the following: > > ctlr->num_chipselect = max_t(int, nb, ctlr->num_chipselect); > > such that what the controller has is the maximum between the number of > 'cs-gpios' properties parsed and what was already populated in > ctrl->num_chipselect during bcm2835_spi_probe(), which for this driver > is BCM2835_SPI_NUM_CS (3). If you make a initial device tree (or add overlay in the rpi's config.txt) with more on the bus than BCM2835_SPI_NUM_CS (in my case 8 devices), you get into this trampling memory state. As the devices are added, once the chip_select is equal to or greater than BCM2835_SPI_NUM_CS, it's writing off the end of the arrays. There is no protection from this happening. By the looks of it, this isn't the only driver this could happen with, but it is the one I have hardware for to test. There are also drivers that look like they don't have a problem going well beyond the limit they gave. There is protection in spi_add_device, which will catch extra added later, but not ones in the device tree when the spi controller was registered. >> This patches inforces CS limit but sets that limit to the max of the >> default limit and what is in the device tree when driver is loaded. >> >> Signed-off-by: Joe Burmeister <joe.burmeister@devtank.co.uk> > You have changed many more things that just enforcing a limit on > BCM2835_SPI_NUM_CS you have now made all chip-select related data > structuresd dynamically allocated and you have changed a number of > prints to use the shorthand "dev" instead of &pdev->dev. The change to dynamic allocated arrays is just to support what is given in the device tree rather than increase and enforce the CS limit just for my case. The shorthand is of course not required. I'll drop it on resubmitting. Regards, Joe _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-04-22 20:10 UTC|newest] Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-04-20 8:34 [PATCH] spi: bcm2835: Fix buffer overflow with CS able to go beyond limit Joe Burmeister 2021-04-20 8:34 ` Joe Burmeister 2021-04-22 16:42 ` Mark Brown 2021-04-22 16:42 ` Mark Brown 2021-04-22 16:50 ` Florian Fainelli 2021-04-22 16:50 ` Florian Fainelli 2021-04-22 20:10 ` Joe Burmeister [this message] 2021-04-22 20:10 ` Joe Burmeister 2021-04-22 23:49 ` Florian Fainelli 2021-04-22 23:49 ` Florian Fainelli 2021-04-23 10:03 ` Joe Burmeister 2021-04-23 10:03 ` Joe Burmeister 2021-04-23 11:57 ` Mark Brown 2021-04-23 11:57 ` Mark Brown 2021-04-23 14:12 ` Joe Burmeister 2021-04-23 14:12 ` Joe Burmeister 2021-04-23 16:20 ` Mark Brown 2021-04-23 16:20 ` Mark Brown 2021-04-23 17:34 ` Nicolas Saenz Julienne 2021-04-23 17:34 ` Nicolas Saenz Julienne 2021-05-01 19:51 ` Lukas Wunner 2021-05-04 11:51 ` Mark Brown 2021-05-04 11:51 ` Mark Brown 2021-05-04 13:53 ` Lukas Wunner
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=7c9f9376-1a80-b624-7b9e-0f6d04437c02@devtank.co.uk \ --to=joe.burmeister@devtank.co.uk \ --cc=bcm-kernel-feedback-list@broadcom.com \ --cc=broonie@kernel.org \ --cc=f.fainelli@gmail.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-rpi-kernel@lists.infradead.org \ --cc=linux-spi@vger.kernel.org \ --cc=nsaenzjulienne@suse.de \ --cc=rjui@broadcom.com \ --cc=sbranden@broadcom.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.