2 ksmbd fixes, including one for stable
-----BEGIN PGP SIGNATURE----- iQGzBAABCgAdFiEE6fsu8pdIjtWE/DpLiiy9cAdyT1EFAmWz98EACgkQiiy9cAdy T1HlJgv/YrHQn08KHVUEC35U4XAtWVRKP6UsMZgj3ru7F+MurHKamhuyzd8WxhFE 2WVnnx0frue8wvFNd3GTnivWrW3zLu3QbeG2RjdHD3Z58uKb/fkq8K4HU1PAYpLC 6pLGQ2qaKcTzqOUs65PVsBtL7Eb5OG3kWjR5tCBohIB9uWo4weiKcRDDryhSZZr9 p5TfJ0bbttz60XUHZ8pCgj4cjsb9DScqalYrvMIuUIzjdKg3rgSXsr4mOPPPyqRB 1allNGBosL9iBXuSRY3boYivEI+tyZq8UH3KPQKd0XV1qzaWTg/f8wNb0CdBWGXQ xeTRPBc9CswhNEWVWgpq4zbxBhkUF9ZXgCJlnca/OgPL6inuST+FAB9CKCd4kPrx hxXHrfzYAvjUvZvtK32c64J4BF9EcJ8jQtdnheezy7FdKZuuCZCRss35MVwCd38v DaqqYb4Etfmj3HjlyxYxU+rNsk/lvZr/ZMixQ9sIIDJFjsYCRh4rH1YmGN2DaVOP tmLP3/w/ =FipL -----END PGP SIGNATURE----- Merge tag '6.8-rc2-smb3-server-fixes' of git://git.samba.org/ksmbd Pull smb server fixes from Steve French: - Fix netlink OOB - Minor kernel doc fix * tag '6.8-rc2-smb3-server-fixes' of git://git.samba.org/ksmbd: ksmbd: fix global oob in ksmbd_nl_policy smb: Fix some kernel-doc comments
This commit is contained in:
commit
8c6f6a7646
fs/smb/server
@ -304,7 +304,8 @@ enum ksmbd_event {
|
||||
KSMBD_EVENT_SPNEGO_AUTHEN_REQUEST,
|
||||
KSMBD_EVENT_SPNEGO_AUTHEN_RESPONSE = 15,
|
||||
|
||||
KSMBD_EVENT_MAX
|
||||
__KSMBD_EVENT_MAX,
|
||||
KSMBD_EVENT_MAX = __KSMBD_EVENT_MAX - 1
|
||||
};
|
||||
|
||||
/*
|
||||
|
@ -74,7 +74,7 @@ static int handle_unsupported_event(struct sk_buff *skb, struct genl_info *info)
|
||||
static int handle_generic_event(struct sk_buff *skb, struct genl_info *info);
|
||||
static int ksmbd_ipc_heartbeat_request(void);
|
||||
|
||||
static const struct nla_policy ksmbd_nl_policy[KSMBD_EVENT_MAX] = {
|
||||
static const struct nla_policy ksmbd_nl_policy[KSMBD_EVENT_MAX + 1] = {
|
||||
[KSMBD_EVENT_UNSPEC] = {
|
||||
.len = 0,
|
||||
},
|
||||
@ -403,7 +403,7 @@ static int handle_generic_event(struct sk_buff *skb, struct genl_info *info)
|
||||
return -EPERM;
|
||||
#endif
|
||||
|
||||
if (type >= KSMBD_EVENT_MAX) {
|
||||
if (type > KSMBD_EVENT_MAX) {
|
||||
WARN_ON(1);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
@ -365,6 +365,7 @@ static int ksmbd_tcp_readv(struct tcp_transport *t, struct kvec *iov_orig,
|
||||
* @t: TCP transport instance
|
||||
* @buf: buffer to store read data from socket
|
||||
* @to_read: number of bytes to read from socket
|
||||
* @max_retries: number of retries if reading from socket fails
|
||||
*
|
||||
* Return: on success return number of bytes read from socket,
|
||||
* otherwise return error number
|
||||
@ -416,6 +417,7 @@ static void tcp_destroy_socket(struct socket *ksmbd_socket)
|
||||
|
||||
/**
|
||||
* create_socket - create socket for ksmbd/0
|
||||
* @iface: interface to bind the created socket to
|
||||
*
|
||||
* Return: 0 on success, error number otherwise
|
||||
*/
|
||||
|
Loading…
x
Reference in New Issue
Block a user