Commit 8c6f6a76 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents d1bba17e ebeae8ad

fs/smb/server/ksmbd_netlink.h

+2 −1
Original line number Diff line number Diff line
@@ -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

};



/*

fs/smb/server/transport_ipc.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

	}

fs/smb/server/transport_tcp.c

+2 −0
Original line number Diff line number Diff line
@@ -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

 */