Commit a91e1138 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'v6.19-rc1-smb3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6 

Pull smb client fixes from Steve French:

 - important fix for reconnect problem

 - minor cleanup

* tag 'v6.19-rc1-smb3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6:
  cifs: update internal module version number
  smb: move some SMB1 definitions into common/smb1pdu.h
  smb: align durable reconnect v2 context to 8 byte boundary
parents 9a903e6d d8a4af8f

fs/smb/client/cifsfs.h

+2 −2
Original line number Diff line number Diff line
@@ -145,6 +145,6 @@ extern const struct export_operations cifs_export_ops; 
#endif /* CONFIG_CIFS_NFSD_EXPORT */



/* when changing internal version - update following two lines at same time */

#define SMB3_PRODUCT_BUILD 57

#define CIFS_VERSION   "2.57"

#define SMB3_PRODUCT_BUILD 58

#define CIFS_VERSION   "2.58"

#endif				/* _CIFSFS_H */

fs/smb/client/cifspdu.h

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
#include <net/sock.h>

#include <linux/unaligned.h>

#include "../common/smbfsctl.h"

#include "../common/smb2pdu.h"

#include "../common/smb1pdu.h"



#define CIFS_PROT   0

#define POSIX_PROT  (CIFS_PROT+1)

fs/smb/common/smb1pdu.h

0 → 100644
+56 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: LGPL-2.1 */

/*

 *

 *   Copyright (C) International Business Machines  Corp., 2002,2009

 *                 2018 Samsung Electronics Co., Ltd.

 *   Author(s): Steve French <sfrench@us.ibm.com>

 *              Namjae Jeon <linkinjeon@kernel.org>

 *

 */



#ifndef _COMMON_SMB1_PDU_H

#define _COMMON_SMB1_PDU_H



#define SMB1_PROTO_NUMBER		cpu_to_le32(0x424d53ff)



/*

 * See MS-CIFS 2.2.3.1

 *     MS-SMB 2.2.3.1

 */

struct smb_hdr {

	__u8 Protocol[4];

	__u8 Command;

	union {

		struct {

			__u8 ErrorClass;

			__u8 Reserved;

			__le16 Error;

		} __packed DosError;

		__le32 CifsError;

	} __packed Status;

	__u8 Flags;

	__le16 Flags2;		/* note: le */

	__le16 PidHigh;

	union {

		struct {

			__le32 SequenceNumber;  /* le */

			__u32 Reserved; /* zero */

		} __packed Sequence;

		__u8 SecuritySignature[8];	/* le */

	} __packed Signature;

	__u8 pad[2];

	__u16 Tid;

	__le16 Pid;

	__u16 Uid;

	__le16 Mid;

	__u8 WordCount;

} __packed;



/* See MS-CIFS 2.2.4.52.1 */

typedef struct smb_negotiate_req {

	struct smb_hdr hdr;	/* wct = 0 */

	__le16 ByteCount;

	unsigned char DialectsArray[];

} __packed SMB_NEGOTIATE_REQ;



#endif /* _COMMON_SMB1_PDU_H */

fs/smb/common/smb2pdu.h

+1 −40
Original line number Diff line number Diff line
@@ -1293,6 +1293,7 @@ struct create_durable_handle_reconnect_v2 { 
	struct create_context_hdr ccontext;

	__u8   Name[8];

	struct durable_reconnect_context_v2 dcontext;

	__u8 Pad[4];

} __packed;



/* See MS-SMB2 2.2.14.2.12 */
@@ -1985,39 +1986,6 @@ struct smb2_lease_ack { 
	__le64 LeaseDuration;

} __packed;



/*

 * See MS-CIFS 2.2.3.1

 *     MS-SMB 2.2.3.1

 */

struct smb_hdr {

	__u8 Protocol[4];

	__u8 Command;

	union {

		struct {

			__u8 ErrorClass;

			__u8 Reserved;

			__le16 Error;

		} __packed DosError;

		__le32 CifsError;

	} __packed Status;

	__u8 Flags;

	__le16 Flags2;		/* note: le */

	__le16 PidHigh;

	union {

		struct {

			__le32 SequenceNumber;  /* le */

			__u32 Reserved; /* zero */

		} __packed Sequence;

		__u8 SecuritySignature[8];	/* le */

	} __packed Signature;

	__u8 pad[2];

	__u16 Tid;

	__le16 Pid;

	__u16 Uid;

	__le16 Mid;

	__u8 WordCount;

} __packed;



#define OP_BREAK_STRUCT_SIZE_20		24

#define OP_BREAK_STRUCT_SIZE_21		36
@@ -2122,11 +2090,4 @@ struct smb_hdr { 
#define SET_MINIMUM_RIGHTS (FILE_READ_EA | FILE_READ_ATTRIBUTES \

				| READ_CONTROL | SYNCHRONIZE)



/* See MS-CIFS 2.2.4.52.1 */

typedef struct smb_negotiate_req {

	struct smb_hdr hdr;	/* wct = 0 */

	__le16 ByteCount;

	unsigned char DialectsArray[];

} __packed SMB_NEGOTIATE_REQ;



#endif				/* _COMMON_SMB2PDU_H */

fs/smb/common/smbglob.h

+0 −2
Original line number Diff line number Diff line
@@ -11,8 +11,6 @@ 
#ifndef _COMMON_SMB_GLOB_H

#define _COMMON_SMB_GLOB_H



#define SMB1_PROTO_NUMBER		cpu_to_le32(0x424d53ff)



struct smb_version_values {

	char		*version_string;

	__u16		protocol_id;