shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 04:10:18 +09:00
Code Issues Packages Projects Releases Wiki Activity

smb: client: change lease epoch type from unsigned int to __u16

Browse Source 
commit 57e4a9bd61c308f607bc3e55e8fa02257b06b552 upstream.

MS-SMB2 section 2.2.13.2.10 specifies that 'epoch' should be a 16-bit
unsigned integer used to track lease state changes. Change the data
type of all instances of 'epoch' from unsigned int to __u16. This
simplifies the epoch change comparisons and makes the code more
compliant with the protocol spec.

Cc: stable@vger.kernel.org
Signed-off-by: Meetakshi Setiya <msetiya@microsoft.com>
Reviewed-by: Shyam Prasad N <sprasad@microsoft.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Meetakshi Setiya
2025-02-06 01:50:41 -05:00
committed by Greg Kroah-Hartman
parent c6b9eaeff4
commit 7879a3e54c
5 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
fs/smb/client/cifsglob.h
View File

@@ -286,7 +286,7 @@ struct smb_version_operations {
int (*handle_cancelled_mid)(struct mid_q_entry *, struct TCP_Server_Info *); int (*handle_cancelled_mid)(struct mid_q_entry *, struct TCP_Server_Info *);
void (*downgrade_oplock)(struct TCP_Server_Info *server, void (*downgrade_oplock)(struct TCP_Server_Info *server,
struct cifsInodeInfo *cinode, __u32 oplock, struct cifsInodeInfo *cinode, __u32 oplock,
unsigned int epoch, bool *purge_cache); __u16 epoch, bool *purge_cache);
/* process transaction2 response */ /* process transaction2 response */
bool (*check_trans2)(struct mid_q_entry *, struct TCP_Server_Info *, bool (*check_trans2)(struct mid_q_entry *, struct TCP_Server_Info *,
char *, int); char *, int);
@@ -466,12 +466,12 @@ struct smb_version_operations {
/* if we can do cache read operations */ /* if we can do cache read operations */
bool (*is_read_op)(__u32); bool (*is_read_op)(__u32);
/* set oplock level for the inode */ /* set oplock level for the inode */
void (*set_oplock_level)(struct cifsInodeInfo *, __u32, unsigned int, void (*set_oplock_level)(struct cifsInodeInfo *cinode, __u32 oplock, __u16 epoch,
bool *); bool *purge_cache);
/* create lease context buffer for CREATE request */ /* create lease context buffer for CREATE request */
char * (*create_lease_buf)(u8 *lease_key, u8 oplock); char * (*create_lease_buf)(u8 *lease_key, u8 oplock);
/* parse lease context buffer and return oplock/epoch info */ /* parse lease context buffer and return oplock/epoch info */
__u8 (*parse_lease_buf)(void *buf, unsigned int *epoch, char *lkey); __u8 (*parse_lease_buf)(void *buf, __u16 *epoch, char *lkey);
ssize_t (*copychunk_range)(const unsigned int, ssize_t (*copychunk_range)(const unsigned int,
struct cifsFileInfo *src_file, struct cifsFileInfo *src_file,
struct cifsFileInfo *target_file, struct cifsFileInfo *target_file,
@@ -1328,7 +1328,7 @@ struct cifs_fid {
__u8 create_guid[16]; __u8 create_guid[16];
__u32 access; __u32 access;
struct cifs_pending_open *pending_open; struct cifs_pending_open *pending_open;
unsigned int epoch; __u16 epoch;
#ifdef CONFIG_CIFS_DEBUG2 #ifdef CONFIG_CIFS_DEBUG2
__u64 mid; __u64 mid;
#endif /* CIFS_DEBUG2 */ #endif /* CIFS_DEBUG2 */
@@ -1360,7 +1360,7 @@ struct cifsFileInfo {
bool swapfile:1; bool swapfile:1;
bool oplock_break_cancelled:1; bool oplock_break_cancelled:1;
bool offload:1; /* offload final part of _put to a wq */ bool offload:1; /* offload final part of _put to a wq */
unsigned int oplock_epoch; /* epoch from the lease break */ __u16 oplock_epoch; /* epoch from the lease break */
__u32 oplock_level; /* oplock/lease level from the lease break */ __u32 oplock_level; /* oplock/lease level from the lease break */
int count; int count;
spinlock_t file_info_lock; /* protects four flag/count fields above */ spinlock_t file_info_lock; /* protects four flag/count fields above */
@@ -1510,7 +1510,7 @@ struct cifsInodeInfo {
spinlock_t open_file_lock; /* protects openFileList */ spinlock_t open_file_lock; /* protects openFileList */
__u32 cifsAttrs; /* e.g. DOS archive bit, sparse, compressed, system */ __u32 cifsAttrs; /* e.g. DOS archive bit, sparse, compressed, system */
unsigned int oplock; /* oplock/lease level we have */ unsigned int oplock; /* oplock/lease level we have */
unsigned int epoch; /* used to track lease state changes */ __u16 epoch; /* used to track lease state changes */
#define CIFS_INODE_PENDING_OPLOCK_BREAK (0) /* oplock break in progress */ #define CIFS_INODE_PENDING_OPLOCK_BREAK (0) /* oplock break in progress */
#define CIFS_INODE_PENDING_WRITERS (1) /* Writes in progress */ #define CIFS_INODE_PENDING_WRITERS (1) /* Writes in progress */
#define CIFS_INODE_FLAG_UNUSED (2) /* Unused flag */ #define CIFS_INODE_FLAG_UNUSED (2) /* Unused flag */

2
fs/smb/client/smb1ops.c
View File

@@ -377,7 +377,7 @@ coalesce_t2(char *second_buf, struct smb_hdr *target_hdr)
static void static void
cifs_downgrade_oplock(struct TCP_Server_Info *server, cifs_downgrade_oplock(struct TCP_Server_Info *server,
struct cifsInodeInfo *cinode, __u32 oplock, struct cifsInodeInfo *cinode, __u32 oplock,
unsigned int epoch, bool *purge_cache) __u16 epoch, bool *purge_cache)
{ {
cifs_set_oplock_level(cinode, oplock); cifs_set_oplock_level(cinode, oplock);
} }

18
fs/smb/client/smb2ops.c
View File

@@ -4111,22 +4111,22 @@ static long smb3_fallocate(struct file *file, struct cifs_tcon *tcon, int mode,
static void static void
smb2_downgrade_oplock(struct TCP_Server_Info *server, smb2_downgrade_oplock(struct TCP_Server_Info *server,
struct cifsInodeInfo *cinode, __u32 oplock, struct cifsInodeInfo *cinode, __u32 oplock,
unsigned int epoch, bool *purge_cache) __u16 epoch, bool *purge_cache)
{ {
server->ops->set_oplock_level(cinode, oplock, 0, NULL); server->ops->set_oplock_level(cinode, oplock, 0, NULL);
} }
static void static void
smb21_set_oplock_level(struct cifsInodeInfo *cinode, __u32 oplock, smb21_set_oplock_level(struct cifsInodeInfo *cinode, __u32 oplock,
unsigned int epoch, bool *purge_cache); __u16 epoch, bool *purge_cache);
static void static void
smb3_downgrade_oplock(struct TCP_Server_Info *server, smb3_downgrade_oplock(struct TCP_Server_Info *server,
struct cifsInodeInfo *cinode, __u32 oplock, struct cifsInodeInfo *cinode, __u32 oplock,
unsigned int epoch, bool *purge_cache) __u16 epoch, bool *purge_cache)
{ {
unsigned int old_state = cinode->oplock; unsigned int old_state = cinode->oplock;
unsigned int old_epoch = cinode->epoch; __u16 old_epoch = cinode->epoch;
unsigned int new_state; unsigned int new_state;
if (epoch > old_epoch) { if (epoch > old_epoch) {
@@ -4146,7 +4146,7 @@ smb3_downgrade_oplock(struct TCP_Server_Info *server,
static void static void
smb2_set_oplock_level(struct cifsInodeInfo *cinode, __u32 oplock, smb2_set_oplock_level(struct cifsInodeInfo *cinode, __u32 oplock,
unsigned int epoch, bool *purge_cache) __u16 epoch, bool *purge_cache)
{ {
oplock &= 0xFF; oplock &= 0xFF;
cinode->lease_granted = false; cinode->lease_granted = false;
@@ -4170,7 +4170,7 @@ smb2_set_oplock_level(struct cifsInodeInfo *cinode, __u32 oplock,
static void static void
smb21_set_oplock_level(struct cifsInodeInfo *cinode, __u32 oplock, smb21_set_oplock_level(struct cifsInodeInfo *cinode, __u32 oplock,
unsigned int epoch, bool *purge_cache) __u16 epoch, bool *purge_cache)
{ {
char message[5] = {0}; char message[5] = {0};
unsigned int new_oplock = 0; unsigned int new_oplock = 0;
@@ -4207,7 +4207,7 @@ smb21_set_oplock_level(struct cifsInodeInfo *cinode, __u32 oplock,
static void static void
smb3_set_oplock_level(struct cifsInodeInfo *cinode, __u32 oplock, smb3_set_oplock_level(struct cifsInodeInfo *cinode, __u32 oplock,
unsigned int epoch, bool *purge_cache) __u16 epoch, bool *purge_cache)
{ {
unsigned int old_oplock = cinode->oplock; unsigned int old_oplock = cinode->oplock;
@@ -4321,7 +4321,7 @@ smb3_create_lease_buf(u8 *lease_key, u8 oplock)
} }
static __u8 static __u8
smb2_parse_lease_buf(void *buf, unsigned int *epoch, char *lease_key) smb2_parse_lease_buf(void *buf, __u16 *epoch, char *lease_key)
{ {
struct create_lease *lc = (struct create_lease *)buf; struct create_lease *lc = (struct create_lease *)buf;
@@ -4332,7 +4332,7 @@ smb2_parse_lease_buf(void *buf, unsigned int *epoch, char *lease_key)
} }
static __u8 static __u8
smb3_parse_lease_buf(void *buf, unsigned int *epoch, char *lease_key) smb3_parse_lease_buf(void *buf, __u16 *epoch, char *lease_key)
{ {
struct create_lease_v2 *lc = (struct create_lease_v2 *)buf; struct create_lease_v2 *lc = (struct create_lease_v2 *)buf;

2
fs/smb/client/smb2pdu.c
View File

@@ -2158,7 +2158,7 @@ parse_posix_ctxt(struct create_context *cc, struct smb2_file_all_info *info,
int smb2_parse_contexts(struct TCP_Server_Info *server, int smb2_parse_contexts(struct TCP_Server_Info *server,
struct kvec *rsp_iov, struct kvec *rsp_iov,
unsigned int *epoch, __u16 *epoch,
char *lease_key, __u8 *oplock, char *lease_key, __u8 *oplock,
struct smb2_file_all_info *buf, struct smb2_file_all_info *buf,
struct create_posix_rsp *posix) struct create_posix_rsp *posix)

2
fs/smb/client/smb2proto.h
View File

@@ -251,7 +251,7 @@ extern enum securityEnum smb2_select_sectype(struct TCP_Server_Info *,
enum securityEnum); enum securityEnum);
int smb2_parse_contexts(struct TCP_Server_Info *server, int smb2_parse_contexts(struct TCP_Server_Info *server,
struct kvec *rsp_iov, struct kvec *rsp_iov,
unsigned int *epoch, __u16 *epoch,
char *lease_key, __u8 *oplock, char *lease_key, __u8 *oplock,
struct smb2_file_all_info *buf, struct smb2_file_all_info *buf,
struct create_posix_rsp *posix); struct create_posix_rsp *posix);