Skip to contentSkip to conversation

SPI fixes for v5.17-rc7

GIT PULL Merged Mark Brown 5 participants 9 messages Mar 10, 2022 – Mar 16, 2022 SPI

lore
Share & tools
lore

Mark Brown

author maintainer
#0 lore raw

The following changes since commit 80808768e41324d2e23de89972b5406c1020e6e4:

spi: rockchip: terminate dma transmission when slave abort (2022-02-17 15:33:18 +0000)

are available in the Git repository at:

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git tags/spi-fix-v5.17-rc7

for you to fetch changes up to 1a4e53d2fc4f68aa654ad96d13ad042e1a8e8a7d:

spi: Fix invalid sgs value (2022-03-08 12:27:33 +0000)

----------------------------------------------------------------
spi: Fix for v5.17

One fix for type conversion issues when working out maximum scatter/gather segment sizes which caused problems for some systems which where the limits overflow due to the type conversion.

----------------------------------------------------------------
Biju Das (1):
spi: Fix invalid sgs value

 drivers/spi/spi.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
#1 lore raw
Quoted 4 lines · Mark Brown

One fix for type conversion issues when working out maximum scatter/gather segment sizes which caused problems for some systems which where the limits overflow due to the type conversion.

Side note: 'ctrl->max_dma_len' is a 'size_t', so even 'unsigned int' isn't necessarily a sufficient type.

Not that I see anything setting it to values that would cause problems, but it looks conceptually like a similar problem as that 'max_seg_size' thing was.

Linus

merge bot Merged
#8 lore raw
In reply to Mark Brown
The pull request you sent on Thu, 10 Mar 2022 12:13:11 +0000:

The pull request you sent on Thu, 10 Mar 2022 12:13:11 +0000:

Quoted 1 line

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git tags/spi-fix-v5.17-rc7

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/1db333d9a51f3459fba1bcaa564d95befe79f0b3

Thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html
author maintainer
#2 lore raw
In reply to Linus Torvalds
Quoted 8 lines · Linus Torvalds
Quoted 3 lines · Mark Brown

One fix for type conversion issues when working out maximum scatter/gather segment sizes which caused problems for some systems which where the limits overflow due to the type conversion.

Side note: 'ctrl->max_dma_len' is a 'size_t', so even 'unsigned int' isn't necessarily a sufficient type.

Hrm, yes - thanks for spotting that.

#3 lore raw

Hi Mark,

Quoted 10 lines · Mark Brown
Quoted 7 lines · Linus Torvalds
Quoted 3 lines · Mark Brown

One fix for type conversion issues when working out maximum scatter/gather segment sizes which caused problems for some systems which where the limits overflow due to the type conversion.

Side note: 'ctrl->max_dma_len' is a 'size_t', so even 'unsigned int' isn't necessarily a sufficient type.

Hrm, yes - thanks for spotting that.

I had noticed while reviewing the patch, but changing to size_t wouldn't help much, as other related code paths treat the value as unsigned int anyway.

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

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

#4 lore raw
Quoted 4 lines · Geert Uytterhoeven

I had noticed while reviewing the patch, but changing to size_t wouldn't help much, as other related code paths treat the value as unsigned int anyway.

.. but it really would.

Note that the paths *after* this code don't matter. Because the result is guaranteed to fit in 'unsigned int' anyway.

Put another way:

min_t(unsigned int,x,y)

is buggy if one of x/y is 'size_t'. Why? Because if that one gets truncated, you're doing 'min()' with a value that may be artificially much too small (that was exactly the problem commit 1a4e53d2fc4f:
"spi: Fix invalid sgs value")fixed).

But the situation is _not_ true in the reverse. Look:

    min(size_t,x,y)

is guaranteed to fit in 'unsigned int' as long as _one_ of x,y fits in 'unsigned int' - even if the other doesn't. Because then 'min()' will just pick the one that already had the right size.

To make it really concrete, compare

    min_t(unsigned int, 5, 0x100000001);
    min_t(size_t, 5, 0x100000001);

on a 64-bit machine (ie size_t is 64-bits, and unsigned int is 32-bit).

One returns 1. The other returns 5. Both fit the result in 'unsigned int', but one of them is wrong.

Linus

#5 lore raw

Hi Linus,

Quoted 29 lines · Linus Torvalds
Quoted 3 lines · Geert Uytterhoeven

I had noticed while reviewing the patch, but changing to size_t wouldn't help much, as other related code paths treat the value as unsigned int anyway.

.. but it really would.

Note that the paths *after* this code don't matter. Because the result is guaranteed to fit in 'unsigned int' anyway.

Put another way:

min_t(unsigned int,x,y)

is buggy if one of x/y is 'size_t'. Why? Because if that one gets truncated, you're doing 'min()' with a value that may be artificially much too small (that was exactly the problem commit 1a4e53d2fc4f:
"spi: Fix invalid sgs value")fixed).

But the situation is _not_ true in the reverse. Look:

    min(size_t,x,y)

is guaranteed to fit in 'unsigned int' as long as _one_ of x,y fits in 'unsigned int' - even if the other doesn't. Because then 'min()' will just pick the one that already had the right size.

To make it really concrete, compare

Quoted 7 lines
    min_t(unsigned int, 5, 0x100000001);
    min_t(size_t, 5, 0x100000001);

on a 64-bit machine (ie size_t is 64-bits, and unsigned int is 32-bit).

One returns 1. The other returns 5. Both fit the result in 'unsigned int', but one of them is wrong.

You're absolutely right. So the code should be changed to:

        if (vmalloced_buf || kmap_buf) {
-                desc_len = min_t(unsigned int, max_seg_size, PAGE_SIZE);
+               desc_len = min_t(unsigned long, 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(unsigned int, max_seg_size, ctlr->max_dma_len);
+               desc_len = min_t(size_t, 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 -- [email protected]

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

author maintainer
#6 lore raw

Review

Quoted 13 lines · Geert Uytterhoeven

You're absolutely right. So the code should be changed to:

        if (vmalloced_buf || kmap_buf) {
(quoted diff) +2 -2
-                desc_len = min_t(unsigned int, max_seg_size, PAGE_SIZE);
+               desc_len = min_t(unsigned long, 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(unsigned int, max_seg_size, ctlr->max_dma_len);
+               desc_len = min_t(size_t, max_seg_size, ctlr->max_dma_len);
                sgs = DIV_ROUND_UP(len, desc_len);
        } else {
                return -EINVAL;
        }

Can you send a patch please?

#7 lore raw

Hi Mark,

Quoted 22 lines

Subject: Re: [GIT PULL] SPI fixes for v5.17-rc7

Quoted 4 lines · Geert Uytterhoeven

You're absolutely right. So the code should be changed to:

        if (vmalloced_buf || kmap_buf) {

- desc_len = min_t(unsigned int, max_seg_size,

PAGE_SIZE);

Quoted 1 line

+ desc_len = min_t(unsigned long, max_seg_size,

PAGE_SIZE);

Quoted 10 lines
                sgs = DIV_ROUND_UP(len + offset_in_page(buf), desc_len);
        } else if (virt_addr_valid(buf)) {
-               desc_len = min_t(unsigned int, max_seg_size, ctlr-
max_dma_len);
+               desc_len = min_t(size_t, max_seg_size, ctlr-
max_dma_len);
                sgs = DIV_ROUND_UP(len, desc_len);
        } else {
                return -EINVAL;
        }
Quoted 1 line

Can you send a patch please?

I have send the patch[1]

[1] https://patchwork.kernel.org/project/linux-renesas-soc/patch/[email protected]/

Cheers,
Biju