2023-04-21 16:21:02

by David Howells

[permalink] [raw]
Subject: [PATCH net] rxrpc: Fix error when reading rxrpc tokens

From: Marc Dionne <[email protected]>

When converting from ASSERTCMP to WARN_ON, the tested condition must
be inverted, which was missed for this case.

This would cause an EIO error when trying to read an rxrpc token, for
instance when trying to display tokens with AuriStor's "tokens" command.

Fixes: 84924aac08a4 ("rxrpc: Fix checker warning")
Signed-off-by: Marc Dionne <[email protected]>
Signed-off-by: David Howells <[email protected]>
cc: "David S. Miller" <[email protected]>
cc: Eric Dumazet <[email protected]>
cc: Jakub Kicinski <[email protected]>
cc: Paolo Abeni <[email protected]>
cc: [email protected]
cc: [email protected]
---
net/rxrpc/key.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/rxrpc/key.c b/net/rxrpc/key.c
index 8d53aded09c4..33e8302a79e3 100644
--- a/net/rxrpc/key.c
+++ b/net/rxrpc/key.c
@@ -680,7 +680,7 @@ static long rxrpc_read(const struct key *key,
return -ENOPKG;
}

- if (WARN_ON((unsigned long)xdr - (unsigned long)oldxdr ==
+ if (WARN_ON((unsigned long)xdr - (unsigned long)oldxdr !=
toksize))
return -EIO;
}


2023-04-23 12:54:49

by patchwork-bot+netdevbpf

[permalink] [raw]
Subject: Re: [PATCH net] rxrpc: Fix error when reading rxrpc tokens

Hello:

This patch was applied to netdev/net.git (main)
by David S. Miller <[email protected]>:

On Fri, 21 Apr 2023 17:16:17 +0100 you wrote:
> From: Marc Dionne <[email protected]>
>
> When converting from ASSERTCMP to WARN_ON, the tested condition must
> be inverted, which was missed for this case.
>
> This would cause an EIO error when trying to read an rxrpc token, for
> instance when trying to display tokens with AuriStor's "tokens" command.
>
> [...]

Here is the summary with links:
- [net] rxrpc: Fix error when reading rxrpc tokens
https://git.kernel.org/netdev/net/c/fadfc57cc804

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html