Commit 9717d534 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'v6.12-rc-ksmbd-server-fixes' of git://git.samba.org/ksmbd 

Pull smb server fixes from Steve French:

 - fix querying dentry for char/block special files

 - small cleanup patches

* tag 'v6.12-rc-ksmbd-server-fixes' of git://git.samba.org/ksmbd:
  ksmbd: Correct typos in multiple comments across various files
  ksmbd: fix open failure from block and char device file
  ksmbd: remove unsafe_memcpy use in session setup
  ksmbd: Replace one-element arrays with flexible-array members
  ksmbd: fix warning: comparison of distinct pointer types lacks a cast
parents f04ff5a0 9e676e57

fs/smb/common/smb2pdu.h

+3 −3
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
 * Note that, due to trying to use names similar to the protocol specifications,

 * there are many mixed case field names in the structures below.  Although

 * this does not match typical Linux kernel style, it is necessary to be

 * able to match against the protocol specfication.

 * able to match against the protocol specification.

 *

 * SMB2 commands

 * Some commands have minimal (wct=0,bcc=0), or uninteresting, responses
@@ -491,7 +491,7 @@ struct smb2_encryption_neg_context { 
	__le16	ContextType; /* 2 */

	__le16	DataLength;

	__le32	Reserved;

	/* CipherCount usally 2, but can be 3 when AES256-GCM enabled */

	/* CipherCount usually 2, but can be 3 when AES256-GCM enabled */

	__le16	CipherCount; /* AES128-GCM and AES128-CCM by default */

	__le16	Ciphers[];

} __packed;
@@ -1061,7 +1061,7 @@ struct smb2_server_client_notification { 
#define IL_IMPERSONATION	cpu_to_le32(0x00000002)

#define IL_DELEGATE		cpu_to_le32(0x00000003)



/* File Attrubutes */

/* File Attributes */

#define FILE_ATTRIBUTE_READONLY			0x00000001

#define FILE_ATTRIBUTE_HIDDEN			0x00000002

#define FILE_ATTRIBUTE_SYSTEM			0x00000004

fs/smb/server/connection.c

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ DECLARE_RWSEM(conn_list_lock); 
/**

 * ksmbd_conn_free() - free resources of the connection instance

 *

 * @conn:	connection instance to be cleand up

 * @conn:	connection instance to be cleaned up

 *

 * During the thread termination, the corresponding conn instance

 * resources(sock/memory) are released and finally the conn object is freed.

fs/smb/server/ksmbd_netlink.h

+1 −1
Original line number Diff line number Diff line
@@ -213,7 +213,7 @@ struct ksmbd_tree_connect_response { 
};



/*

 * IPC Request struture to disconnect tree connection.

 * IPC Request structure to disconnect tree connection.

 */

struct ksmbd_tree_disconnect_request {

	__u64	session_id;	/* session id */

fs/smb/server/oplock.c

+2 −2
Original line number Diff line number Diff line
@@ -796,7 +796,7 @@ static void __smb2_lease_break_noti(struct work_struct *wk) 
/**

 * smb2_lease_break_noti() - break lease when a new client request

 *			write lease

 * @opinfo:		conains lease state information

 * @opinfo:		contains lease state information

 *

 * Return:	0 on success, otherwise error

 */
@@ -1484,7 +1484,7 @@ void create_lease_buf(u8 *rbuf, struct lease *lease) 
}



/**

 * parse_lease_state() - parse lease context containted in file open request

 * parse_lease_state() - parse lease context contained in file open request

 * @open_req:	buffer containing smb2 file open(create) request

 *

 * Return: allocated lease context object on success, otherwise NULL

fs/smb/server/server.c

+1 −1
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ static void handle_ksmbd_work(struct work_struct *wk) 


/**

 * queue_ksmbd_work() - queue a smb request to worker thread queue

 *		for proccessing smb command and sending response

 *		for processing smb command and sending response

 * @conn:	connection instance

 *

 * read remaining data from socket create and submit work.