Skip to content

Commit da0edab

Browse files
committed
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 <[email protected]> Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/ Signed-off-by: John Johansen <[email protected]>
1 parent c688041 commit da0edab

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

security/apparmor/lib.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@ int aa_parse_debug_params(const char *str)
8484
/**
8585
* val_mask_to_str - convert a perm mask to its short string
8686
* @str: character buffer to store string in (at least 10 characters)
87-
* @str_size: size of the @str buffer
88-
* @chrs: NUL-terminated character buffer of permission characters
87+
* @size: size of the @str buffer
88+
* @table: NUL-terminated character buffer of permission characters
8989
* @mask: permission mask to convert
9090
*/
9191
static int val_mask_to_str(char *str, size_t size,

security/apparmor/lsm.c

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1182,7 +1182,9 @@ static void unix_connect_peers(struct aa_sk_ctx *sk_ctx,
11821182

11831183
/**
11841184
* apparmor_unix_stream_connect - check perms before making unix domain conn
1185-
*
1185+
* @sk: sk attempting to connect
1186+
* @peer_sk: sk that is accepting the connection
1187+
* @newsk: new sk created for this connection
11861188
* peer is locked when this hook is called
11871189
*/
11881190
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,
12161218

12171219
/**
12181220
* apparmor_unix_may_send - check perms before conn or sending unix dgrams
1221+
* @sock: socket sending the message
1222+
* @peer: socket message is being send to
12191223
*
12201224
* sock and peer are locked when this hook is called
1221-
*
12221225
* called by: dgram_connect peer setup but path not copied to newsk
12231226
*/
12241227
static int apparmor_unix_may_send(struct socket *sock, struct socket *peer)
@@ -1336,6 +1339,9 @@ static int apparmor_socket_socketpair(struct socket *socka,
13361339

13371340
/**
13381341
* apparmor_socket_bind - check perms before bind addr to socket
1342+
* @sock: socket to bind the address to
1343+
* @address: address that is being bound
1344+
* @addrlen: length of @address
13391345
*/
13401346
static int apparmor_socket_bind(struct socket *sock,
13411347
struct sockaddr *address, int addrlen)

0 commit comments

Comments
 (0)