Merge tag 'integrity-v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar...

[linux-2.6-microblaze.git] / net / rxrpc / insecure.c

diff --git a/net/rxrpc/insecure.c b/net/rxrpc/insecure.c
index f6c59f5..9aae99d 100644 (file)
--- a/net/rxrpc/insecure.c
+++ b/net/rxrpc/insecure.c
@@ -8,20 +8,25 @@
 #include <net/af_rxrpc.h>
 #include "ar-internal.h"
 
-static int none_init_connection_security(struct rxrpc_connection *conn)
+static int none_init_connection_security(struct rxrpc_connection *conn,
+                                        struct rxrpc_key_token *token)
 {
        return 0;
 }
 
-static int none_prime_packet_security(struct rxrpc_connection *conn)
+/*
+ * Work out how much data we can put in an unsecured packet.
+ */
+static int none_how_much_data(struct rxrpc_call *call, size_t remain,
+                              size_t *_buf_size, size_t *_data_size, size_t *_offset)
 {
+       *_buf_size = *_data_size = min_t(size_t, remain, RXRPC_JUMBO_DATALEN);
+       *_offset = 0;
        return 0;
 }
 
-static int none_secure_packet(struct rxrpc_call *call,
-                             struct sk_buff *skb,
-                             size_t data_size,
-                             void *sechdr)
+static int none_secure_packet(struct rxrpc_call *call, struct sk_buff *skb,
+                             size_t data_size)
 {
        return 0;
 }
@@ -86,8 +91,8 @@ const struct rxrpc_security rxrpc_no_security = {
        .init                           = none_init,
        .exit                           = none_exit,
        .init_connection_security       = none_init_connection_security,
-       .prime_packet_security          = none_prime_packet_security,
        .free_call_crypto               = none_free_call_crypto,
+       .how_much_data                  = none_how_much_data,
        .secure_packet                  = none_secure_packet,
        .verify_packet                  = none_verify_packet,
        .locate_data                    = none_locate_data,