* [PATCH AUTOSEL 5.16 12/13] spi: Fix invalid sgs value
[not found] <20220316141354.247750-1-sashal@kernel.org>
@ 2022-03-16 14:13 ` Sasha Levin
2022-03-16 16:07 ` Geert Uytterhoeven
0 siblings, 1 reply; 3+ messages in thread
From: Sasha Levin @ 2022-03-16 14:13 UTC (permalink / raw)
To: linux-kernel, stable
Cc: Biju Das, Lad Prabhakar, Geert Uytterhoeven, Mark Brown,
Sasha Levin, linux-spi
From: Biju Das <biju.das.jz@bp.renesas.com>
[ Upstream commit 1a4e53d2fc4f68aa654ad96d13ad042e1a8e8a7d ]
max_seg_size is unsigned int and it can have a value up to 2^32
(for eg:-RZ_DMAC driver sets dma_set_max_seg_size as U32_MAX)
When this value is used in min_t() as an integer type, it becomes
-1 and the value of sgs becomes 0.
Fix this issue by replacing the 'int' data type with 'unsigned int'
in min_t().
Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
Reviewed-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/r/20220307184843.9994-1-biju.das.jz@bp.renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/spi/spi.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 8ba87b7f8f1a..ed4e6983eda0 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -1021,10 +1021,10 @@ int spi_map_buf(struct spi_controller *ctlr, struct device *dev,
int i, ret;
if (vmalloced_buf || kmap_buf) {
- desc_len = min_t(int, max_seg_size, PAGE_SIZE);
+ desc_len = min_t(unsigned int, max_seg_size, PAGE_SIZE);
sgs = DIV_ROUND_UP(len + offset_in_page(buf), desc_len);
} else if (virt_addr_valid(buf)) {
- desc_len = min_t(int, max_seg_size, ctlr->max_dma_len);
+ desc_len = min_t(unsigned int, max_seg_size, ctlr->max_dma_len);
sgs = DIV_ROUND_UP(len, desc_len);
} else {
return -EINVAL;
--
2.34.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH AUTOSEL 5.16 12/13] spi: Fix invalid sgs value
2022-03-16 14:13 ` [PATCH AUTOSEL 5.16 12/13] spi: Fix invalid sgs value Sasha Levin
@ 2022-03-16 16:07 ` Geert Uytterhoeven
2022-03-16 16:40 ` Sasha Levin
0 siblings, 1 reply; 3+ messages in thread
From: Geert Uytterhoeven @ 2022-03-16 16:07 UTC (permalink / raw)
To: Sasha Levin
Cc: Linux Kernel Mailing List, stable, Biju Das, Lad Prabhakar,
Mark Brown, linux-spi
Hi Sasha,
On Wed, Mar 16, 2022 at 3:15 PM Sasha Levin <sashal@kernel.org> wrote:
> From: Biju Das <biju.das.jz@bp.renesas.com>
>
> [ Upstream commit 1a4e53d2fc4f68aa654ad96d13ad042e1a8e8a7d ]
This commit is not 100% correct, cfr.
https://lore.kernel.org/lkml/CAHk-=wiZnS6n1ROQg3FHd=bcVTHi-sKutKT+toiViQEH47ZACg@mail.gmail.com
Please postpone backporting until the issue has been resolved.
>
> max_seg_size is unsigned int and it can have a value up to 2^32
> (for eg:-RZ_DMAC driver sets dma_set_max_seg_size as U32_MAX)
> When this value is used in min_t() as an integer type, it becomes
> -1 and the value of sgs becomes 0.
>
> Fix this issue by replacing the 'int' data type with 'unsigned int'
> in min_t().
>
> Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
> Reviewed-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
> Link: https://lore.kernel.org/r/20220307184843.9994-1-biju.das.jz@bp.renesas.com
> Signed-off-by: Mark Brown <broonie@kernel.org>
> Signed-off-by: Sasha Levin <sashal@kernel.org>
> ---
> drivers/spi/spi.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
> index 8ba87b7f8f1a..ed4e6983eda0 100644
> --- a/drivers/spi/spi.c
> +++ b/drivers/spi/spi.c
> @@ -1021,10 +1021,10 @@ int spi_map_buf(struct spi_controller *ctlr, struct device *dev,
> int i, ret;
>
> if (vmalloced_buf || kmap_buf) {
> - desc_len = min_t(int, max_seg_size, PAGE_SIZE);
> + desc_len = min_t(unsigned int, max_seg_size, PAGE_SIZE);
> sgs = DIV_ROUND_UP(len + offset_in_page(buf), desc_len);
> } else if (virt_addr_valid(buf)) {
> - desc_len = min_t(int, max_seg_size, ctlr->max_dma_len);
> + desc_len = min_t(unsigned int, max_seg_size, ctlr->max_dma_len);
> sgs = DIV_ROUND_UP(len, desc_len);
> } else {
> return -EINVAL;
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH AUTOSEL 5.16 12/13] spi: Fix invalid sgs value
2022-03-16 16:07 ` Geert Uytterhoeven
@ 2022-03-16 16:40 ` Sasha Levin
0 siblings, 0 replies; 3+ messages in thread
From: Sasha Levin @ 2022-03-16 16:40 UTC (permalink / raw)
To: Geert Uytterhoeven
Cc: Linux Kernel Mailing List, stable, Biju Das, Lad Prabhakar,
Mark Brown, linux-spi
On Wed, Mar 16, 2022 at 05:07:28PM +0100, Geert Uytterhoeven wrote:
>Hi Sasha,
>
>On Wed, Mar 16, 2022 at 3:15 PM Sasha Levin <sashal@kernel.org> wrote:
>> From: Biju Das <biju.das.jz@bp.renesas.com>
>>
>> [ Upstream commit 1a4e53d2fc4f68aa654ad96d13ad042e1a8e8a7d ]
>
>This commit is not 100% correct, cfr.
>https://lore.kernel.org/lkml/CAHk-=wiZnS6n1ROQg3FHd=bcVTHi-sKutKT+toiViQEH47ZACg@mail.gmail.com
>Please postpone backporting until the issue has been resolved.
Will check back in a week, thanks!
--
Thanks,
Sasha
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-03-16 16:41 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <20220316141354.247750-1-sashal@kernel.org>
2022-03-16 14:13 ` [PATCH AUTOSEL 5.16 12/13] spi: Fix invalid sgs value Sasha Levin
2022-03-16 16:07 ` Geert Uytterhoeven
2022-03-16 16:40 ` Sasha Levin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).