aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJohn Johansen <john.johansen@canonical.com>2025-06-20 15:05:01 -0700
committerJohn Johansen <john.johansen@canonical.com>2025-07-20 02:19:27 -0700
commitda0edababafa444e638a0be6dd2feef0a9e529e2 (patch)
treeb3e40e6ffd3c42da11bd268124594644a10c82a3
parentapparmor: Fix unaligned memory accesses in KUnit test (diff)
downloadwireguard-linux-da0edababafa444e638a0be6dd2feef0a9e529e2.tar.xz
wireguard-linux-da0edababafa444e638a0be6dd2feef0a9e529e2.zip
apparmor: fix kernel doc warnings for kernel test robot
Fix kernel doc warnings for the functions - apparmor_socket_bind - apparmor_unix_may_send - apparmor_unix_stream_connect - val_mask_to_str Reported-by: kernel test robot <lkp@intel.com> Closes: https://lore.kernel.org/oe-kbuild-all/202506070127.B1bc3da4-lkp@intel.com/ Signed-off-by: John Johansen <john.johansen@canonical.com>
-rw-r--r--security/apparmor/lib.c4
-rw-r--r--security/apparmor/lsm.c10
2 files changed, 10 insertions, 4 deletions
diff --git a/security/apparmor/lib.c b/security/apparmor/lib.c
index f51e79cc36d4..7d43f6a62404 100644
--- a/security/apparmor/lib.c
+++ b/security/apparmor/lib.c
@@ -84,8 +84,8 @@ int aa_parse_debug_params(const char *str)
/**
* val_mask_to_str - convert a perm mask to its short string
* @str: character buffer to store string in (at least 10 characters)
- * @str_size: size of the @str buffer
- * @chrs: NUL-terminated character buffer of permission characters
+ * @size: size of the @str buffer
+ * @table: NUL-terminated character buffer of permission characters
* @mask: permission mask to convert
*/
static int val_mask_to_str(char *str, size_t size,
diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c
index d3da9db244b0..09fe237e5324 100644
--- a/security/apparmor/lsm.c
+++ b/security/apparmor/lsm.c
@@ -1182,7 +1182,9 @@ static void unix_connect_peers(struct aa_sk_ctx *sk_ctx,
/**
* apparmor_unix_stream_connect - check perms before making unix domain conn
- *
+ * @sk: sk attempting to connect
+ * @peer_sk: sk that is accepting the connection
+ * @newsk: new sk created for this connection
* peer is locked when this hook is called
*/
static int apparmor_unix_stream_connect(struct sock *sk, struct sock *peer_sk,
@@ -1216,9 +1218,10 @@ static int apparmor_unix_stream_connect(struct sock *sk, struct sock *peer_sk,
/**
* apparmor_unix_may_send - check perms before conn or sending unix dgrams
+ * @sock: socket sending the message
+ * @peer: socket message is being send to
*
* sock and peer are locked when this hook is called
- *
* called by: dgram_connect peer setup but path not copied to newsk
*/
static int apparmor_unix_may_send(struct socket *sock, struct socket *peer)
@@ -1336,6 +1339,9 @@ static int apparmor_socket_socketpair(struct socket *socka,
/**
* apparmor_socket_bind - check perms before bind addr to socket
+ * @sock: socket to bind the address to
+ * @address: address that is being bound
+ * @addrlen: length of @address
*/
static int apparmor_socket_bind(struct socket *sock,
struct sockaddr *address, int addrlen)