Skip to contentSkip to conversation

rxrpc: Truncate UTS_RELEASE for rxrpc version

PATCH Applied David Howells 4 participants 5 messages May 26, 2023 – May 30, 2023

Subsystems (3)
lore
Share & tools
lore

David Howells

author maintainer
#0 lore raw

PATCH 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.

Fixes 44ba06987c0b ("RxRPC: Handle VERSION Rx protocol packets")
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
index 31f738d65f1c..da0b3b5157d5 100644
@@ -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
index 5d44dc08f66d..e8e14c6f904d 100644
@@ -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
index 5e69ea6b233d..993c69f97488 100644
@@ -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
Reviewed-by on v1 1/1
#1 lore raw
Quoted 18 lines · David Howells

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.

Quoted 15 lines
Fixes 44ba06987c0b ("RxRPC: Handle VERSION Rx protocol packets")
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]>
Reviewed-by on v1 1/1
#2 lore raw
In reply to David Howells
Quoted 76 lines · David Howells

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.

Fixes 44ba06987c0b ("RxRPC: Handle VERSION Rx protocol packets")
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
index 31f738d65f1c..da0b3b5157d5 100644
@@ -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
index 5d44dc08f66d..e8e14c6f904d 100644
@@ -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
index 5e69ea6b233d..993c69f97488 100644
@@ -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
Reviewed-by on v1 1/1
#3 lore raw
In reply to David Howells
Quoted 75 lines · David Howells

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.

Fixes 44ba06987c0b ("RxRPC: Handle VERSION Rx protocol packets")
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
index 31f738d65f1c..da0b3b5157d5 100644
@@ -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
index 5d44dc08f66d..e8e14c6f904d 100644
@@ -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
index 5e69ea6b233d..993c69f97488 100644
@@ -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
#4 lore raw
In reply to David Howells
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_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."

[...]

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