rxrpc: Fix untrusted unsigned subtract
Subsystems (3)
David Howells
maintainerPATCH 1/1 rxrpc: Fix untrusted unsigned subtract
Fix the following Smatch Smatch static checker warning:
net/rxrpc/rxgk_app.c:65 rxgk_yfs_decode_ticket()
warn: untrusted unsigned subtract. 'ticket_len - 10 * 4'
by prechecking the length of what we're trying to extract in two places in the token and decoding for a response packet.
Also use sizeof() on the struct we're extracting rather specifying the size numerically to be consistent with the other related statements.
--- net/rxrpc/rxgk_app.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-)
net/rxrpc/rxgk_app.c +14 -5
@@ -54,6 +54,10 @@ int rxgk_yfs_decode_ticket(struct rxrpc_connection *conn, struct sk_buff *skb,_enter ("" ); +if (ticket_len <10 *sizeof (__be32)) +return rxrpc_abort_conn (conn, skb,RXGK_INCONSISTENCY , -EPROTO , + rxgk_abort_resp_short_yfs_tkt); +/* Get the session key length */ ret =skb_copy_bits (skb, ticket_offset, tmp,sizeof (tmp));if (ret <0 )
@@ -195,22 +199,23 @@ int rxgk_extract_token(struct rxrpc_connection *conn, struct sk_buff *skb,__be32 token_len; } container; +if (token_len <sizeof (container)) + goto short_packet; +/* Decode the RXGK_TokenContainer object. This tells us which server * key we should be using. We can then fetch the key, get the secret * and set up the crypto to extract the token. */ if (skb_copy_bits (skb, token_offset, &container,sizeof (container)) <0 ) -return rxrpc_abort_conn (conn, skb,RXGK_PACKETSHORT , -EPROTO , - rxgk_abort_resp_tok_short); + goto short_packet; kvno =ntohl (container.kvno); enctype =ntohl (container.enctype); ticket_len =ntohl (container.token_len); ticket_offset = token_offset +sizeof (container); -if (xdr_round_up (ticket_len) > token_len -3 *4 ) -return rxrpc_abort_conn (conn, skb,RXGK_PACKETSHORT , -EPROTO , - rxgk_abort_resp_tok_short); +if (xdr_round_up (ticket_len) > token_len -sizeof (container)) + goto short_packet;_debug ("KVNO %u" , kvno);_debug ("ENC %u" , enctype);
@@ -285,4 +290,8 @@ int rxgk_extract_token(struct rxrpc_connection *conn, struct sk_buff *skb,* also come out this way if the ticket decryption fails. */ return ret; + +short_packet: +return rxrpc_abort_conn (conn, skb,RXGK_PACKETSHORT , -EPROTO , + rxgk_abort_resp_tok_short); }
Quoted 1 line · David Howells
Fix the following Smatch Smatch static checker warning:
nit: Smatch Smatch -> Smatch
Quoted 22 lines
net/rxrpc/rxgk_app.c:65rxgk_yfs_decode_ticket()
warn: untrusted unsigned subtract. 'ticket_len- 10 * 4'by prechecking the length of what we're trying to extract in two places in the token and decoding for a response packet.
Also use
sizeof()on the struct we're extracting rather specifying the size numerically to be consistent with the other related statements.Fixes 9d1d2b59341f ("rxrpc: rxgk: Implement the yfs-rxgk security class (GSSAPI)")Reported-by Dan Carpenter <[email protected]>Signed-off-by David Howells <[email protected]>cc Marc Dionne <[email protected]>cc Jakub Kicinski <[email protected]>cc "David S. Miller" <[email protected]>cc Eric Dumazet <[email protected]>cc Paolo Abeni <[email protected]>cc Simon Horman <[email protected]>
Quoted 3 lines
--- net/rxrpc/rxgk_app.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-)
David Howells
maintainerQuoted 3 lines · Simon Horman
Quoted 1 line
Fix the following Smatch Smatch static checker warning:
nit: Smatch Smatch -> Smatch
Yeah. Can that be fixed up at time of application?
David
Jakub Kicinski
maintainerQuoted 7 lines · On Fri, 12 Sep 2025 20:43:58 +0100 David Howells wrote:
Quoted 3 lines · Simon Horman
Quoted 1 line
Fix the following Smatch Smatch static checker warning:
nit: Smatch Smatch -> Smatch
Yeah. Can that be fixed up at time of application?
Done!
This patch was applied to netdev/net.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net.git (main)
by Jakub Kicinski <[email protected]>:
Quoted 9 lines · On Fri, 12 Sep 2025 00:06:17 +0100 you wrote:
Fix the following Smatch Smatch static checker warning:
net/rxrpc/rxgk_app.c:65rxgk_yfs_decode_ticket()
warn: untrusted unsigned subtract. 'ticket_len- 10 * 4'by prechecking the length of what we're trying to extract in two places in the token and decoding for a response packet.
[...]
Here is the summary with links:
- [net] rxrpc: Fix untrusted unsigned subtract
https://git.kernel.org/netdev/net/c/2429a1976481
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html