From: David Howells Date: Sun, 27 Sep 2020 10:13:04 +0000 (+0100) Subject: rxrpc: Allow security classes to give more info on server keys X-Git-Tag: v5.11-rc1~169^2~184^2~8 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d5953f6543b50ccdaa550b2d25bc1a16e31a2f42;p=thirdparty%2Flinux.git rxrpc: Allow security classes to give more info on server keys Allow a security class to give more information on an rxrpc_s-type key when it is viewed in /proc/keys. This will allow the upcoming RxGK security class to show the enctype name here. Signed-off-by: David Howells --- diff --git a/net/rxrpc/ar-internal.h b/net/rxrpc/ar-internal.h index 6682c797b8787..0fb294725ff20 100644 --- a/net/rxrpc/ar-internal.h +++ b/net/rxrpc/ar-internal.h @@ -227,6 +227,9 @@ struct rxrpc_security { /* Destroy the payload of a server key */ void (*destroy_server_key)(struct key *); + /* Describe a server key */ + void (*describe_server_key)(const struct key *, struct seq_file *); + /* initialise a connection's security */ int (*init_connection_security)(struct rxrpc_connection *, struct rxrpc_key_token *); diff --git a/net/rxrpc/server_key.c b/net/rxrpc/server_key.c index 1a2f0b63ee1d2..ead3471307ee5 100644 --- a/net/rxrpc/server_key.c +++ b/net/rxrpc/server_key.c @@ -105,7 +105,11 @@ static void rxrpc_destroy_s(struct key *key) static void rxrpc_describe_s(const struct key *key, struct seq_file *m) { + const struct rxrpc_security *sec = key->payload.data[1]; + seq_puts(m, key->description); + if (sec && sec->describe_server_key) + sec->describe_server_key(key, m); } /*