rxrpc: Truncate UTS_RELEASE for rxrpc version
Subsystems (3)
David Howells
maintainerPATCH 1/1 rxrpc: Truncate UTS_RELEASE for rxrpc version
UTS_RELEASE has a maximum length of 64 which can cause rxrpc_version to exceed the 65 byte message limit.
Per the rx spec[1]: "If a server receives a packet with a type value of 13, and the client-initiated flag set, it should respond with a 65-byte payload containing a string that identifies the version of AFS software it is running."
The current implementation causes a compile error when WERROR is turned on and/or UTS_RELEASE exceeds the length of 49 (making the version string more than 64 characters).
Fix this by generating the string during module initialisation and limiting the UTS_RELEASE segment of the string does not exceed 49 chars. We need to make sure that the 64 bytes includes "linux-" at the front and " AF_RXRPC" at the back as this may be used in pattern matching.
--- net/rxrpc/af_rxrpc.c | 1 + net/rxrpc/ar-internal.h | 1 + net/rxrpc/local_event.c | 11 ++++++++++- 3 files changed, 12 insertions(+), 1 deletion(-)
net/rxrpc/af_rxrpc.c +1 -0
@@ -980,6 +980,7 @@ static int __init af_rxrpc_init(void) BUILD_BUG_ON(sizeof(struct rxrpc_skb_priv) > sizeof_field(struct sk_buff, cb)); ret = -ENOMEM ; +rxrpc_gen_version_string (); rxrpc_call_jar =kmem_cache_create ("rxrpc_call_jar" ,sizeof (struct rxrpc_call ),0 ,SLAB_HWCACHE_ALIGN ,NULL );
net/rxrpc/ar-internal.h +1 -0
@@ -1068,6 +1068,7 @@ int rxrpc_get_server_data_key(struct rxrpc_connection *, const void *, time64_t,/* * local_event.c */ +void rxrpc_gen_version_string (void );void rxrpc_send_version_request (struct rxrpc_local *local,struct rxrpc_host_header *hdr,struct sk_buff *skb);
net/rxrpc/local_event.c +10 -1
@@ -16,7 +16,16 @@#include <generated/utsrelease.h> #include "ar-internal.h" -static const char rxrpc_version_string[65 ] ="linux-" UTS_RELEASE " AF_RXRPC" ; +static char rxrpc_version_string[65 ];// "linux-" UTS_RELEASE " AF_RXRPC"; + +/* +* Generate the VERSION packet string. +*/ +void rxrpc_gen_version_string (void ) +{ +snprintf (rxrpc_version_string,sizeof (rxrpc_version_string), +"linux-%.49s AF_RXRPC" ,UTS_RELEASE ); +}/* * Reply to a version request
Quoted 18 lines · David Howells
UTS_RELEASEhas a maximum length of 64 which can causerxrpc_versionto exceed the 65 byte message limit.Per the rx spec[1]: "If a server receives a packet with a type value of 13, and the client-initiated flag set, it should respond with a 65-byte payload containing a string that identifies the version of AFS software it is running."
The current implementation causes a compile error when WERROR is turned on and/or
UTS_RELEASEexceeds the length of 49 (making the version string more than 64 characters).Fix this by generating the string during module initialisation and limiting the
UTS_RELEASEsegment of the string does not exceed 49 chars. We need to make sure that the 64 bytes includes "linux-" at the front and "AF_RXRPC" at the back as this may be used in pattern matching.
Quoted 15 lines
Fixes 44ba06987c0b ("RxRPC: Handle VERSION Rx protocol packets")Reported-by Kenny Ho <[email protected]>Signed-off-by David Howells <[email protected]>Acked-by Kenny Ho <[email protected]>cc Marc Dionne <[email protected]>cc Andrew Lunn <[email protected]>cc David Laight <[email protected]>cc "David S. Miller" <[email protected]>cc Eric Dumazet <[email protected]>cc Jakub Kicinski <[email protected]>cc Paolo Abeni <[email protected]>
Quoted 76 lines · David Howells
UTS_RELEASEhas a maximum length of 64 which can causerxrpc_versionto exceed the 65 byte message limit.Per the rx spec[1]: "If a server receives a packet with a type value of 13, and the client-initiated flag set, it should respond with a 65-byte payload containing a string that identifies the version of AFS software it is running."
The current implementation causes a compile error when WERROR is turned on and/or
UTS_RELEASEexceeds the length of 49 (making the version string more than 64 characters).Fix this by generating the string during module initialisation and limiting the
UTS_RELEASEsegment of the string does not exceed 49 chars. We need to make sure that the 64 bytes includes "linux-" at the front and "AF_RXRPC" at the back as this may be used in pattern matching.Fixes 44ba06987c0b ("RxRPC: Handle VERSION Rx protocol packets")Reported-by Kenny Ho <[email protected]>Signed-off-by David Howells <[email protected]>Acked-by Kenny Ho <[email protected]>cc Marc Dionne <[email protected]>cc Andrew Lunn <[email protected]>cc David Laight <[email protected]>cc "David S. Miller" <[email protected]>cc Eric Dumazet <[email protected]>cc Jakub Kicinski <[email protected]>cc Paolo Abeni <[email protected]>--- net/rxrpc/af_rxrpc.c | 1 + net/rxrpc/ar-internal.h | 1 + net/rxrpc/local_event.c | 11 ++++++++++- 3 files changed, 12 insertions(+), 1 deletion(-)net/rxrpc/af_rxrpc.c +1
-0@@ -980,6 +980,7 @@ static int __init af_rxrpc_init(void) BUILD_BUG_ON(sizeof(struct rxrpc_skb_priv) > sizeof_field(struct sk_buff, cb)); ret = -ENOMEM ; +rxrpc_gen_version_string (); rxrpc_call_jar =kmem_cache_create ("rxrpc_call_jar" ,sizeof (struct rxrpc_call ),0 ,SLAB_HWCACHE_ALIGN ,NULL );net/rxrpc/ar-internal.h +1
-0@@ -1068,6 +1068,7 @@ int rxrpc_get_server_data_key(struct rxrpc_connection *, const void *, time64_t,/* * local_event.c */ +void rxrpc_gen_version_string (void );void rxrpc_send_version_request (struct rxrpc_local *local,struct rxrpc_host_header *hdr,struct sk_buff *skb);net/rxrpc/local_event.c +3
-1@@ -16,7 +16,16 @@#include <generated/utsrelease.h> #include "ar-internal.h" -static const char rxrpc_version_string[65 ] ="linux-" UTS_RELEASE " AF_RXRPC" ; +static char rxrpc_version_string[65 ];// "linux-" UTS_RELEASE " AF_RXRPC"; + +/*
net/rxrpc/local_event.c line 31
Quoted 10 lines
net/rxrpc/local_event.c +7
-0+* Generate the VERSION packet string. +*/ +void rxrpc_gen_version_string (void ) +{ +snprintf (rxrpc_version_string,sizeof (rxrpc_version_string), +"linux-%.49s AF_RXRPC" ,UTS_RELEASE ); +}/* * Reply to a version request
Quoted 75 lines · David Howells
UTS_RELEASEhas a maximum length of 64 which can causerxrpc_versionto exceed the 65 byte message limit.Per the rx spec[1]: "If a server receives a packet with a type value of 13, and the client-initiated flag set, it should respond with a 65-byte payload containing a string that identifies the version of AFS software it is running."
The current implementation causes a compile error when WERROR is turned on and/or
UTS_RELEASEexceeds the length of 49 (making the version string more than 64 characters).Fix this by generating the string during module initialisation and limiting the
UTS_RELEASEsegment of the string does not exceed 49 chars. We need to make sure that the 64 bytes includes "linux-" at the front and "AF_RXRPC" at the back as this may be used in pattern matching.Fixes 44ba06987c0b ("RxRPC: Handle VERSION Rx protocol packets")Reported-by Kenny Ho <[email protected]>Signed-off-by David Howells <[email protected]>Acked-by Kenny Ho <[email protected]>cc Marc Dionne <[email protected]>cc Andrew Lunn <[email protected]>cc David Laight <[email protected]>cc "David S. Miller" <[email protected]>cc Eric Dumazet <[email protected]>cc Jakub Kicinski <[email protected]>cc Paolo Abeni <[email protected]>---
net/rxrpc/af_rxrpc.c| 1 +net/rxrpc/ar-internal.h| 1 +net/rxrpc/local_event.c| 11 ++++++++++-3 files changed, 12 insertions(+), 1 deletion(-)net/rxrpc/af_rxrpc.c +1
-0@@ -980,6 +980,7 @@ static int __init af_rxrpc_init(void) BUILD_BUG_ON(sizeof(struct rxrpc_skb_priv) > sizeof_field(struct sk_buff, cb)); ret = -ENOMEM ; +rxrpc_gen_version_string ();
rxrpc_call_jar= kmem_cache_create(
"rxrpc_call_jar",sizeof(struct rxrpc_call), 0,SLAB_HWCACHE_ALIGN, NULL);net/rxrpc/ar-internal.h +1
-0@@ -1068,6 +1068,7 @@ int rxrpc_get_server_data_key(struct rxrpc_connection *, const void *, time64_t,/* * local_event.c */ +void rxrpc_gen_version_string (void ); void rxrpc_send_version_request(struct rxrpc_local *local, struct rxrpc_host_header *hdr,struct
sk_buff*skb);net/rxrpc/local_event.c +2
-1@@ -16,7 +16,16 @@#include <generated/utsrelease.h> #include "ar-internal.h" -static const char rxrpc_version_string[65 ] ="linux-" UTS_RELEASE " AF_RXRPC"; +static char rxrpc_version_string[65 ];// "linux-" UTS_RELEASE " AF_RXRPC"; +
net/rxrpc/local_event.c line 31
Quoted 10 lines
net/rxrpc/local_event.c +8
-0+/* +* Generate the VERSION packet string. +*/ +void rxrpc_gen_version_string (void ) +{ +snprintf (rxrpc_version_string,sizeof (rxrpc_version_string), +"linux-%.49s AF_RXRPC" ,UTS_RELEASE ); +}/* * Reply to a version request
This patch was applied to netdev/net.git (main) by Paolo Abeni <[email protected]>:
Hello:
This patch was applied to netdev/net.git (main)
by Paolo Abeni <[email protected]>:
Quoted 9 lines · On Fri, 26 May 2023 12:34:54 +0100 you wrote:
UTS_RELEASEhas a maximum length of 64 which can causerxrpc_versionto exceed the 65 byte message limit.Per the rx spec[1]: "If a server receives a packet with a type value of 13, and the client-initiated flag set, it should respond with a 65-byte payload containing a string that identifies the version of AFS software it is running."
[...]
Here is the summary with links:
- [net] rxrpc: Truncate UTS_RELEASE for rxrpc version
https://git.kernel.org/netdev/net/c/020c69c1a793
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html