2 files changed, 12 insertions, 0 deletions

diff --git a/net/rxrpc/input.c b/net/rxrpc/input.c
index 21800e6f5019..0410d2277ca2 100644
--- a/net/rxrpc/input.c
+++ b/net/rxrpc/input.c
@@ -1200,6 +1200,12 @@ void rxrpc_data_ready(struct sock *udp_sk)
                     !rxrpc_validate_jumbo(skb))
                         goto bad_message;
                 break;
+
+                /* Packet types 9-11 should just be ignored. */
+        case RXRPC_PACKET_TYPE_PARAMS:
+        case RXRPC_PACKET_TYPE_10:
+        case RXRPC_PACKET_TYPE_11:
+                goto discard;
         }
 
         rcu_read_lock();
diff --git a/net/rxrpc/protocol.h b/net/rxrpc/protocol.h
index 4bddcf3face3..93da73bf7098 100644
--- a/net/rxrpc/protocol.h
+++ b/net/rxrpc/protocol.h
@@ -46,6 +46,9 @@ struct rxrpc_wire_header {
 #define RXRPC_PACKET_TYPE_CHALLENGE     6       /* connection security challenge (SRVR->CLNT) */
 #define RXRPC_PACKET_TYPE_RESPONSE      7       /* connection secutity response (CLNT->SRVR) */
 #define RXRPC_PACKET_TYPE_DEBUG         8       /* debug info request */
+#define RXRPC_PACKET_TYPE_PARAMS        9       /* Parameter negotiation (unspec'd, ignore) */
+#define RXRPC_PACKET_TYPE_10            10      /* Ignored */
+#define RXRPC_PACKET_TYPE_11            11      /* Ignored */
 #define RXRPC_PACKET_TYPE_VERSION       13      /* version string request */
 #define RXRPC_N_PACKET_TYPES            14      /* number of packet types (incl type 0) */
 
@@ -78,6 +81,9 @@ struct rxrpc_wire_header {
                 (1 << RXRPC_PACKET_TYPE_CHALLENGE) |    \
                 (1 << RXRPC_PACKET_TYPE_RESPONSE) |     \
                 /*(1 << RXRPC_PACKET_TYPE_DEBUG) | */   \
+                (1 << RXRPC_PACKET_TYPE_PARAMS) |       \
+                (1 << RXRPC_PACKET_TYPE_10) |           \
+                (1 << RXRPC_PACKET_TYPE_11) |           \
                 (1 << RXRPC_PACKET_TYPE_VERSION))
 
 /*****************************************************************************/