iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

9 cifs/smb3 fixes: two timestamp fixes, one oops fix (during oplock break) for stable, two fixes found in multichannel testing, two fixes for file create when using modeforsid mount parm

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQGzBAABCAAdFiEE6fsu8pdIjtWE/DpLiiy9cAdyT1EFAl3sPUUACgkQiiy9cAdy
 T1GumAwAhh0Fk2uEV01REMgA6MgQ2hrdGE5HariSTzGifCk8cxMnq1H1u9yxtic8
 uvEJQaUmTLWrN2C+xqD2JqPmJyrPOtnL0PLCLQk2/RsPCsDgYnmdKoAehInPh17g
 J8MoKPp1/1wYhbOl7CeF0xo2rEchoh/PcPCXpt8qj+M+kBgQkI64UQ/6iY/mV9Zl
 n7WJJFDyz3D1+SaJPaVxMpNxZcMpFbGqVJYTWP4v3pL2E8wEhyWjAryLCJAFFGf7
 Y2FwOSFuifMN/qC9t83W5KkRT9I/zRQ2g5qK1tC24LiTjQ3cqkCy1SSqpKQyvKwz
 P/oRX0HsuIbr1KFzN55kg831m/V7/1B/5bf9AivfhjsAoSyp2yyVQgPeV+nQkO0r
 iQdNatohC9HlwXmrypS+GhLXnj8xLnCR4+Aj7hGSuiVLHnCOfnGjQxI40BFWaBli
 1RG9agkploMYvcjcgSgDGVFFWTeHgSQKI1DQTL2Nx4py1zj7Rv/kEgwkZ3zdEf9h
 PPl37hBM
 =gey9
 -----END PGP SIGNATURE-----

Merge tag '5.5-rc-smb3-fixes-part2' of git://git.samba.org/sfrench/cifs-2.6

Pull cifs fixes from Steve French:
 "Nine cifs/smb3 fixes:

   - one fix for stable (oops during oplock break)

   - two timestamp fixes including important one for updating mtime at
     close to avoid stale metadata caching issue on dirty files (also
     improves perf by using SMB2_CLOSE_FLAG_POSTQUERY_ATTRIB over the
     wire)

   - two fixes for "modefromsid" mount option for file create (now
     allows mode bits to be set more atomically and accurately on create
     by adding "sd_context" on create when modefromsid specified on
     mount)

   - two fixes for multichannel found in testing this week against
     different servers

   - two small cleanup patches"

* tag '5.5-rc-smb3-fixes-part2' of git://git.samba.org/sfrench/cifs-2.6:
  smb3: improve check for when we send the security descriptor context on create
  smb3: fix mode passed in on create for modetosid mount option
  cifs: fix possible uninitialized access and race on iface_list
  cifs: Fix lookup of SMB connections on multichannel
  smb3: query attributes on file close
  smb3: remove unused flag passed into close functions
  cifs: remove redundant assignment to pointer pneg_ctxt
  fs: cifs: Fix atime update check vs mtime
  CIFS: Fix NULL-pointer dereference in smb2_push_mandatory_locks
This commit is contained in:
Linus Torvalds 2019-12-08 12:12:18 -08:00
commit a78f7cdddb
13 changed files with 265 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
fs/cifs/cifsacl.c
View File

@ -802,6 +802,31 @@ static void parse_dacl(struct cifs_acl *pdacl, char *end_of_acl,
return; return;
} }
/*
* Fill in the special SID based on the mode. See
* http://technet.microsoft.com/en-us/library/hh509017(v=ws.10).aspx
*/
unsigned int setup_special_mode_ACE(struct cifs_ace *pntace, __u64 nmode)
{
int i;
unsigned int ace_size = 28;
pntace->type = ACCESS_DENIED_ACE_TYPE;
pntace->flags = 0x0;
pntace->access_req = 0;
pntace->sid.num_subauth = 3;
pntace->sid.revision = 1;
for (i = 0; i < NUM_AUTHS; i++)
pntace->sid.authority[i] = sid_unix_NFS_mode.authority[i];
pntace->sid.sub_auth[0] = sid_unix_NFS_mode.sub_auth[0];
pntace->sid.sub_auth[1] = sid_unix_NFS_mode.sub_auth[1];
pntace->sid.sub_auth[2] = cpu_to_le32(nmode & 07777);
/* size = 1 + 1 + 2 + 4 + 1 + 1 + 6 + (psid->num_subauth*4) */
pntace->size = cpu_to_le16(ace_size);
return ace_size;
}
static int set_chmod_dacl(struct cifs_acl *pndacl, struct cifs_sid *pownersid, static int set_chmod_dacl(struct cifs_acl *pndacl, struct cifs_sid *pownersid,
struct cifs_sid *pgrpsid, __u64 nmode, bool modefromsid) struct cifs_sid *pgrpsid, __u64 nmode, bool modefromsid)
@ -815,23 +840,8 @@ static int set_chmod_dacl(struct cifs_acl *pndacl, struct cifs_sid *pownersid,
if (modefromsid) { if (modefromsid) {
struct cifs_ace *pntace = struct cifs_ace *pntace =
(struct cifs_ace *)((char *)pnndacl + size); (struct cifs_ace *)((char *)pnndacl + size);
int i;
pntace->type = ACCESS_ALLOWED; size += setup_special_mode_ACE(pntace, nmode);
pntace->flags = 0x0;
pntace->access_req = 0;
pntace->sid.num_subauth = 3;
pntace->sid.revision = 1;
for (i = 0; i < NUM_AUTHS; i++)
pntace->sid.authority[i] =
sid_unix_NFS_mode.authority[i];
pntace->sid.sub_auth[0] = sid_unix_NFS_mode.sub_auth[0];
pntace->sid.sub_auth[1] = sid_unix_NFS_mode.sub_auth[1];
pntace->sid.sub_auth[2] = cpu_to_le32(nmode & 07777);
/* size = 1 + 1 + 2 + 4 + 1 + 1 + 6 + (psid->num_subauth*4) */
pntace->size = cpu_to_le16(28);
size += 28;
num_aces++; num_aces++;
} }

32
fs/cifs/cifsacl.h
View File

@ -147,22 +147,22 @@ struct smb3_sd {
} __packed; } __packed;
/* Meaning of 'Control' field flags */ /* Meaning of 'Control' field flags */
#define ACL_CONTROL_SR 0x0001 /* Self relative */ #define ACL_CONTROL_SR 0x8000 /* Self relative */
#define ACL_CONTROL_RM 0x0002 /* Resource manager control bits */ #define ACL_CONTROL_RM 0x4000 /* Resource manager control bits */
#define ACL_CONTROL_PS 0x0004 /* SACL protected from inherits */ #define ACL_CONTROL_PS 0x2000 /* SACL protected from inherits */
#define ACL_CONTROL_PD 0x0008 /* DACL protected from inherits */ #define ACL_CONTROL_PD 0x1000 /* DACL protected from inherits */
#define ACL_CONTROL_SI 0x0010 /* SACL Auto-Inherited */ #define ACL_CONTROL_SI 0x0800 /* SACL Auto-Inherited */
#define ACL_CONTROL_DI 0x0020 /* DACL Auto-Inherited */ #define ACL_CONTROL_DI 0x0400 /* DACL Auto-Inherited */
#define ACL_CONTROL_SC 0x0040 /* SACL computed through inheritance */ #define ACL_CONTROL_SC 0x0200 /* SACL computed through inheritance */
#define ACL_CONTROL_DC 0x0080 /* DACL computed through inheritence */ #define ACL_CONTROL_DC 0x0100 /* DACL computed through inheritence */
#define ACL_CONTROL_SS 0x0100 /* Create server ACL */ #define ACL_CONTROL_SS 0x0080 /* Create server ACL */
#define ACL_CONTROL_DT 0x0200 /* DACL provided by trusteed source */ #define ACL_CONTROL_DT 0x0040 /* DACL provided by trusted source */
#define ACL_CONTROL_SD 0x0400 /* SACL defaulted */ #define ACL_CONTROL_SD 0x0020 /* SACL defaulted */
#define ACL_CONTROL_SP 0x0800 /* SACL is present on object */ #define ACL_CONTROL_SP 0x0010 /* SACL is present on object */
#define ACL_CONTROL_DD 0x1000 /* DACL defaulted */ #define ACL_CONTROL_DD 0x0008 /* DACL defaulted */
#define ACL_CONTROL_DP 0x2000 /* DACL is present on object */ #define ACL_CONTROL_DP 0x0004 /* DACL is present on object */
#define ACL_CONTROL_GD 0x4000 /* Group was defaulted */ #define ACL_CONTROL_GD 0x0002 /* Group was defaulted */
#define ACL_CONTROL_OD 0x8000 /* User was defaulted */ #define ACL_CONTROL_OD 0x0001 /* User was defaulted */
/* Meaning of AclRevision flags */ /* Meaning of AclRevision flags */
#define ACL_REVISION 0x02 /* See section 2.4.4.1 of MS-DTYP */ #define ACL_REVISION 0x02 /* See section 2.4.4.1 of MS-DTYP */

4
fs/cifs/cifsglob.h
View File

@ -368,6 +368,9 @@ struct smb_version_operations {
/* close a file */ /* close a file */
void (*close)(const unsigned int, struct cifs_tcon *, void (*close)(const unsigned int, struct cifs_tcon *,
struct cifs_fid *); struct cifs_fid *);
/* close a file, returning file attributes and timestamps */
void (*close_getattr)(const unsigned int xid, struct cifs_tcon *tcon,
struct cifsFileInfo *pfile_info);
/* send a flush request to the server */ /* send a flush request to the server */
int (*flush)(const unsigned int, struct cifs_tcon *, struct cifs_fid *); int (*flush)(const unsigned int, struct cifs_tcon *, struct cifs_fid *);
/* async read from the server */ /* async read from the server */
@ -774,6 +777,7 @@ struct TCP_Server_Info {
*/ */
int nr_targets; int nr_targets;
bool noblockcnt; /* use non-blocking connect() */ bool noblockcnt; /* use non-blocking connect() */
bool is_channel; /* if a session channel */
}; };
struct cifs_credits { struct cifs_credits {

1
fs/cifs/cifsproto.h
View File

@ -213,6 +213,7 @@ extern struct cifs_ntsd *get_cifs_acl_by_fid(struct cifs_sb_info *,
const struct cifs_fid *, u32 *); const struct cifs_fid *, u32 *);
extern int set_cifs_acl(struct cifs_ntsd *, __u32, struct inode *, extern int set_cifs_acl(struct cifs_ntsd *, __u32, struct inode *,
const char *, int); const char *, int);
extern unsigned int setup_special_mode_ACE(struct cifs_ace *pace, __u64 nmode);
extern void dequeue_mid(struct mid_q_entry *mid, bool malformed); extern void dequeue_mid(struct mid_q_entry *mid, bool malformed);
extern int cifs_read_from_socket(struct TCP_Server_Info *server, char *buf, extern int cifs_read_from_socket(struct TCP_Server_Info *server, char *buf,

6
fs/cifs/connect.c
View File

@ -2712,7 +2712,11 @@ cifs_find_tcp_session(struct smb_vol *vol)
spin_lock(&cifs_tcp_ses_lock); spin_lock(&cifs_tcp_ses_lock);
list_for_each_entry(server, &cifs_tcp_ses_list, tcp_ses_list) { list_for_each_entry(server, &cifs_tcp_ses_list, tcp_ses_list) {
if (!match_server(server, vol)) /*
* Skip ses channels since they're only handled in lower layers
* (e.g. cifs_send_recv).
*/
if (server->is_channel || !match_server(server, vol))
continue; continue;
++server->srv_count; ++server->srv_count;

11
fs/cifs/file.c
View File

@ -315,9 +315,6 @@ cifs_new_fileinfo(struct cifs_fid *fid, struct file *file,
INIT_LIST_HEAD(&fdlocks->locks); INIT_LIST_HEAD(&fdlocks->locks);
fdlocks->cfile = cfile; fdlocks->cfile = cfile;
cfile->llist = fdlocks; cfile->llist = fdlocks;
cifs_down_write(&cinode->lock_sem);
list_add(&fdlocks->llist, &cinode->llist);
up_write(&cinode->lock_sem);
cfile->count = 1; cfile->count = 1;
cfile->pid = current->tgid; cfile->pid = current->tgid;
@ -342,6 +339,10 @@ cifs_new_fileinfo(struct cifs_fid *fid, struct file *file,
oplock = 0; oplock = 0;
} }
cifs_down_write(&cinode->lock_sem);
list_add(&fdlocks->llist, &cinode->llist);
up_write(&cinode->lock_sem);
spin_lock(&tcon->open_file_lock); spin_lock(&tcon->open_file_lock);
if (fid->pending_open->oplock != CIFS_OPLOCK_NO_CHANGE && oplock) if (fid->pending_open->oplock != CIFS_OPLOCK_NO_CHANGE && oplock)
oplock = fid->pending_open->oplock; oplock = fid->pending_open->oplock;
@ -495,7 +496,9 @@ void _cifsFileInfo_put(struct cifsFileInfo *cifs_file,
unsigned int xid; unsigned int xid;
xid = get_xid(); xid = get_xid();
if (server->ops->close) if (server->ops->close_getattr)
server->ops->close_getattr(xid, tcon, cifs_file);
else if (server->ops->close)
server->ops->close(xid, tcon, &cifs_file->fid); server->ops->close(xid, tcon, &cifs_file->fid);
_free_xid(xid); _free_xid(xid);
} }

2
fs/cifs/inode.c
View File

@ -163,7 +163,7 @@ cifs_fattr_to_inode(struct inode *inode, struct cifs_fattr *fattr)
spin_lock(&inode->i_lock); spin_lock(&inode->i_lock);
/* we do not want atime to be less than mtime, it broke some apps */ /* we do not want atime to be less than mtime, it broke some apps */
if (timespec64_compare(&fattr->cf_atime, &fattr->cf_mtime)) if (timespec64_compare(&fattr->cf_atime, &fattr->cf_mtime) < 0)
inode->i_atime = fattr->cf_mtime; inode->i_atime = fattr->cf_mtime;
else else
inode->i_atime = fattr->cf_atime; inode->i_atime = fattr->cf_atime;

32
fs/cifs/sess.c
View File

@ -77,6 +77,8 @@ int cifs_try_adding_channels(struct cifs_ses *ses)
int i = 0; int i = 0;
int rc = 0; int rc = 0;
int tries = 0; int tries = 0;
struct cifs_server_iface *ifaces = NULL;
size_t iface_count;
if (left <= 0) { if (left <= 0) {
cifs_dbg(FYI, cifs_dbg(FYI,
@ -90,6 +92,26 @@ int cifs_try_adding_channels(struct cifs_ses *ses)
return 0; return 0;
} }
/*
* Make a copy of the iface list at the time and use that
* instead so as to not hold the iface spinlock for opening
* channels
*/
spin_lock(&ses->iface_lock);
iface_count = ses->iface_count;
if (iface_count <= 0) {
spin_unlock(&ses->iface_lock);
cifs_dbg(FYI, "no iface list available to open channels\n");
return 0;
}
ifaces = kmemdup(ses->iface_list, iface_count*sizeof(*ifaces),
GFP_ATOMIC);
if (!ifaces) {
spin_unlock(&ses->iface_lock);
return 0;
}
spin_unlock(&ses->iface_lock);
/* /*
* Keep connecting to same, fastest, iface for all channels as * Keep connecting to same, fastest, iface for all channels as
* long as its RSS. Try next fastest one if not RSS or channel * long as its RSS. Try next fastest one if not RSS or channel
@ -105,9 +127,9 @@ int cifs_try_adding_channels(struct cifs_ses *ses)
break; break;
} }
iface = &ses->iface_list[i]; iface = &ifaces[i];
if (is_ses_using_iface(ses, iface) && !iface->rss_capable) { if (is_ses_using_iface(ses, iface) && !iface->rss_capable) {
i = (i+1) % ses->iface_count; i = (i+1) % iface_count;
continue; continue;
} }
@ -115,7 +137,7 @@ int cifs_try_adding_channels(struct cifs_ses *ses)
if (rc) { if (rc) {
cifs_dbg(FYI, "failed to open extra channel on iface#%d rc=%d\n", cifs_dbg(FYI, "failed to open extra channel on iface#%d rc=%d\n",
i, rc); i, rc);
i = (i+1) % ses->iface_count; i = (i+1) % iface_count;
continue; continue;
} }
@ -124,6 +146,7 @@ int cifs_try_adding_channels(struct cifs_ses *ses)
left--; left--;
} }
kfree(ifaces);
return ses->chan_count - old_chan_count; return ses->chan_count - old_chan_count;
} }
@ -213,6 +236,9 @@ cifs_ses_add_channel(struct cifs_ses *ses, struct cifs_server_iface *iface)
chan->server = NULL; chan->server = NULL;
goto out; goto out;
} }
spin_lock(&cifs_tcp_ses_lock);
chan->server->is_channel = true;
spin_unlock(&cifs_tcp_ses_lock);
/* /*
* We need to allocate the server crypto now as we will need * We need to allocate the server crypto now as we will need

2
fs/cifs/smb2inode.c
View File

@ -313,7 +313,7 @@ smb2_compound_op(const unsigned int xid, struct cifs_tcon *tcon,
rqst[num_rqst].rq_iov = close_iov; rqst[num_rqst].rq_iov = close_iov;
rqst[num_rqst].rq_nvec = 1; rqst[num_rqst].rq_nvec = 1;
rc = SMB2_close_init(tcon, &rqst[num_rqst], COMPOUND_FID, rc = SMB2_close_init(tcon, &rqst[num_rqst], COMPOUND_FID,
COMPOUND_FID); COMPOUND_FID, false);
smb2_set_related(&rqst[num_rqst]); smb2_set_related(&rqst[num_rqst]);
if (rc) if (rc)
goto finished; goto finished;

49
fs/cifs/smb2ops.c
View File

@ -1178,7 +1178,7 @@ smb2_set_ea(const unsigned int xid, struct cifs_tcon *tcon,
memset(&close_iov, 0, sizeof(close_iov)); memset(&close_iov, 0, sizeof(close_iov));
rqst[2].rq_iov = close_iov; rqst[2].rq_iov = close_iov;
rqst[2].rq_nvec = 1; rqst[2].rq_nvec = 1;
rc = SMB2_close_init(tcon, &rqst[2], COMPOUND_FID, COMPOUND_FID); rc = SMB2_close_init(tcon, &rqst[2], COMPOUND_FID, COMPOUND_FID, false);
smb2_set_related(&rqst[2]); smb2_set_related(&rqst[2]);
rc = compound_send_recv(xid, ses, flags, 3, rqst, rc = compound_send_recv(xid, ses, flags, 3, rqst,
@ -1332,6 +1332,45 @@ smb2_close_file(const unsigned int xid, struct cifs_tcon *tcon,
SMB2_close(xid, tcon, fid->persistent_fid, fid->volatile_fid); SMB2_close(xid, tcon, fid->persistent_fid, fid->volatile_fid);
} }
static void
smb2_close_getattr(const unsigned int xid, struct cifs_tcon *tcon,
struct cifsFileInfo *cfile)
{
struct smb2_file_network_open_info file_inf;
struct inode *inode;
int rc;
rc = __SMB2_close(xid, tcon, cfile->fid.persistent_fid,
cfile->fid.volatile_fid, &file_inf);
if (rc)
return;
inode = d_inode(cfile->dentry);
spin_lock(&inode->i_lock);
CIFS_I(inode)->time = jiffies;
/* Creation time should not need to be updated on close */
if (file_inf.LastWriteTime)
inode->i_mtime = cifs_NTtimeToUnix(file_inf.LastWriteTime);
if (file_inf.ChangeTime)
inode->i_ctime = cifs_NTtimeToUnix(file_inf.ChangeTime);
if (file_inf.LastAccessTime)
inode->i_atime = cifs_NTtimeToUnix(file_inf.LastAccessTime);
/*
* i_blocks is not related to (i_size / i_blksize),
* but instead 512 byte (2**9) size is required for
* calculating num blocks.
*/
if (le64_to_cpu(file_inf.AllocationSize) > 4096)
inode->i_blocks =
(512 - 1 + le64_to_cpu(file_inf.AllocationSize)) >> 9;
/* End of file and Attributes should not have to be updated on close */
spin_unlock(&inode->i_lock);
}
static int static int
SMB2_request_res_key(const unsigned int xid, struct cifs_tcon *tcon, SMB2_request_res_key(const unsigned int xid, struct cifs_tcon *tcon,
u64 persistent_fid, u64 volatile_fid, u64 persistent_fid, u64 volatile_fid,
@ -1512,7 +1551,7 @@ smb2_ioctl_query_info(const unsigned int xid,
rqst[2].rq_iov = close_iov; rqst[2].rq_iov = close_iov;
rqst[2].rq_nvec = 1; rqst[2].rq_nvec = 1;
rc = SMB2_close_init(tcon, &rqst[2], COMPOUND_FID, COMPOUND_FID); rc = SMB2_close_init(tcon, &rqst[2], COMPOUND_FID, COMPOUND_FID, false);
if (rc) if (rc)
goto iqinf_exit; goto iqinf_exit;
smb2_set_related(&rqst[2]); smb2_set_related(&rqst[2]);
@ -2241,7 +2280,7 @@ smb2_query_info_compound(const unsigned int xid, struct cifs_tcon *tcon,
rqst[2].rq_iov = close_iov; rqst[2].rq_iov = close_iov;
rqst[2].rq_nvec = 1; rqst[2].rq_nvec = 1;
rc = SMB2_close_init(tcon, &rqst[2], COMPOUND_FID, COMPOUND_FID); rc = SMB2_close_init(tcon, &rqst[2], COMPOUND_FID, COMPOUND_FID, false);
if (rc) if (rc)
goto qic_exit; goto qic_exit;
smb2_set_related(&rqst[2]); smb2_set_related(&rqst[2]);
@ -2654,7 +2693,7 @@ smb2_query_symlink(const unsigned int xid, struct cifs_tcon *tcon,
rqst[2].rq_iov = close_iov; rqst[2].rq_iov = close_iov;
rqst[2].rq_nvec = 1; rqst[2].rq_nvec = 1;
rc = SMB2_close_init(tcon, &rqst[2], COMPOUND_FID, COMPOUND_FID); rc = SMB2_close_init(tcon, &rqst[2], COMPOUND_FID, COMPOUND_FID, false);
if (rc) if (rc)
goto querty_exit; goto querty_exit;
@ -4707,6 +4746,7 @@ struct smb_version_operations smb30_operations = {
.open = smb2_open_file, .open = smb2_open_file,
.set_fid = smb2_set_fid, .set_fid = smb2_set_fid,
.close = smb2_close_file, .close = smb2_close_file,
.close_getattr = smb2_close_getattr,
.flush = smb2_flush_file, .flush = smb2_flush_file,
.async_readv = smb2_async_readv, .async_readv = smb2_async_readv,
.async_writev = smb2_async_writev, .async_writev = smb2_async_writev,
@ -4816,6 +4856,7 @@ struct smb_version_operations smb311_operations = {
.open = smb2_open_file, .open = smb2_open_file,
.set_fid = smb2_set_fid, .set_fid = smb2_set_fid,
.close = smb2_close_file, .close = smb2_close_file,
.close_getattr = smb2_close_getattr,
.flush = smb2_flush_file, .flush = smb2_flush_file,
.async_readv = smb2_async_readv, .async_readv = smb2_async_readv,
.async_writev = smb2_async_writev, .async_writev = smb2_async_writev,

128
fs/cifs/smb2pdu.c
View File

@ -554,7 +554,7 @@ static void
assemble_neg_contexts(struct smb2_negotiate_req *req, assemble_neg_contexts(struct smb2_negotiate_req *req,
struct TCP_Server_Info *server, unsigned int *total_len) struct TCP_Server_Info *server, unsigned int *total_len)
{ {
char *pneg_ctxt = (char *)req; char *pneg_ctxt;
unsigned int ctxt_len; unsigned int ctxt_len;
if (*total_len > 200) { if (*total_len > 200) {
@ -2191,6 +2191,72 @@ add_twarp_context(struct kvec *iov, unsigned int *num_iovec, __u64 timewarp)
return 0; return 0;
} }
/* See MS-SMB2 2.2.13.2.2 and MS-DTYP 2.4.6 */
static struct crt_sd_ctxt *
create_sd_buf(umode_t mode, unsigned int *len)
{
struct crt_sd_ctxt *buf;
struct cifs_ace *pace;
unsigned int sdlen, acelen;
*len = roundup(sizeof(struct crt_sd_ctxt) + sizeof(struct cifs_ace), 8);
buf = kzalloc(*len, GFP_KERNEL);
if (buf == NULL)
return buf;
sdlen = sizeof(struct smb3_sd) + sizeof(struct smb3_acl) +
sizeof(struct cifs_ace);
buf->ccontext.DataOffset = cpu_to_le16(offsetof
(struct crt_sd_ctxt, sd));
buf->ccontext.DataLength = cpu_to_le32(sdlen);
buf->ccontext.NameOffset = cpu_to_le16(offsetof
(struct crt_sd_ctxt, Name));
buf->ccontext.NameLength = cpu_to_le16(4);
/* SMB2_CREATE_SD_BUFFER_TOKEN is "SecD" */
buf->Name[0] = 'S';
buf->Name[1] = 'e';
buf->Name[2] = 'c';
buf->Name[3] = 'D';
buf->sd.Revision = 1; /* Must be one see MS-DTYP 2.4.6 */
/*
* ACL is "self relative" ie ACL is stored in contiguous block of memory
* and "DP" ie the DACL is present
*/
buf->sd.Control = cpu_to_le16(ACL_CONTROL_SR | ACL_CONTROL_DP);
/* offset owner, group and Sbz1 and SACL are all zero */
buf->sd.OffsetDacl = cpu_to_le32(sizeof(struct smb3_sd));
buf->acl.AclRevision = ACL_REVISION; /* See 2.4.4.1 of MS-DTYP */
/* create one ACE to hold the mode embedded in reserved special SID */
pace = (struct cifs_ace *)(sizeof(struct crt_sd_ctxt) + (char *)buf);
acelen = setup_special_mode_ACE(pace, (__u64)mode);
buf->acl.AclSize = cpu_to_le16(sizeof(struct cifs_acl) + acelen);
buf->acl.AceCount = cpu_to_le16(1);
return buf;
}
static int
add_sd_context(struct kvec *iov, unsigned int *num_iovec, umode_t mode)
{
struct smb2_create_req *req = iov[0].iov_base;
unsigned int num = *num_iovec;
unsigned int len = 0;
iov[num].iov_base = create_sd_buf(mode, &len);
if (iov[num].iov_base == NULL)
return -ENOMEM;
iov[num].iov_len = len;
if (!req->CreateContextsOffset)
req->CreateContextsOffset = cpu_to_le32(
sizeof(struct smb2_create_req) +
iov[num - 1].iov_len);
le32_add_cpu(&req->CreateContextsLength, len);
*num_iovec = num + 1;
return 0;
}
static struct crt_query_id_ctxt * static struct crt_query_id_ctxt *
create_query_id_buf(void) create_query_id_buf(void)
{ {
@ -2563,7 +2629,9 @@ SMB2_open_init(struct cifs_tcon *tcon, struct smb_rqst *rqst, __u8 *oplock,
return rc; return rc;
} }
if ((oparms->disposition == FILE_CREATE) && if ((oparms->disposition != FILE_OPEN) &&
(oparms->cifs_sb) &&
(oparms->cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MODE_FROM_SID) &&
(oparms->mode != ACL_NO_MODE)) { (oparms->mode != ACL_NO_MODE)) {
if (n_iov > 2) { if (n_iov > 2) {
struct create_context *ccontext = struct create_context *ccontext =
@ -2572,7 +2640,8 @@ SMB2_open_init(struct cifs_tcon *tcon, struct smb_rqst *rqst, __u8 *oplock,
cpu_to_le32(iov[n_iov-1].iov_len); cpu_to_le32(iov[n_iov-1].iov_len);
} }
/* rc = add_sd_context(iov, &n_iov, oparms->mode); */ cifs_dbg(FYI, "add sd with mode 0x%x\n", oparms->mode);
rc = add_sd_context(iov, &n_iov, oparms->mode);
if (rc) if (rc)
return rc; return rc;
} }
@ -2932,7 +3001,7 @@ SMB2_set_compression(const unsigned int xid, struct cifs_tcon *tcon,
int int
SMB2_close_init(struct cifs_tcon *tcon, struct smb_rqst *rqst, SMB2_close_init(struct cifs_tcon *tcon, struct smb_rqst *rqst,
u64 persistent_fid, u64 volatile_fid) u64 persistent_fid, u64 volatile_fid, bool query_attrs)
{ {
struct smb2_close_req *req; struct smb2_close_req *req;
struct kvec *iov = rqst->rq_iov; struct kvec *iov = rqst->rq_iov;
@ -2945,6 +3014,10 @@ SMB2_close_init(struct cifs_tcon *tcon, struct smb_rqst *rqst,
req->PersistentFileId = persistent_fid; req->PersistentFileId = persistent_fid;
req->VolatileFileId = volatile_fid; req->VolatileFileId = volatile_fid;
if (query_attrs)
req->Flags = SMB2_CLOSE_FLAG_POSTQUERY_ATTRIB;
else
req->Flags = 0;
iov[0].iov_base = (char *)req; iov[0].iov_base = (char *)req;
iov[0].iov_len = total_len; iov[0].iov_len = total_len;
@ -2959,8 +3032,9 @@ SMB2_close_free(struct smb_rqst *rqst)
} }
int int
SMB2_close_flags(const unsigned int xid, struct cifs_tcon *tcon, __SMB2_close(const unsigned int xid, struct cifs_tcon *tcon,
u64 persistent_fid, u64 volatile_fid, int flags) u64 persistent_fid, u64 volatile_fid,
struct smb2_file_network_open_info *pbuf)
{ {
struct smb_rqst rqst; struct smb_rqst rqst;
struct smb2_close_rsp *rsp = NULL; struct smb2_close_rsp *rsp = NULL;
@ -2969,6 +3043,8 @@ SMB2_close_flags(const unsigned int xid, struct cifs_tcon *tcon,
struct kvec rsp_iov; struct kvec rsp_iov;
int resp_buftype = CIFS_NO_BUFFER; int resp_buftype = CIFS_NO_BUFFER;
int rc = 0; int rc = 0;
int flags = 0;
bool query_attrs = false;
cifs_dbg(FYI, "Close\n"); cifs_dbg(FYI, "Close\n");
@ -2983,8 +3059,13 @@ SMB2_close_flags(const unsigned int xid, struct cifs_tcon *tcon,
rqst.rq_iov = iov; rqst.rq_iov = iov;
rqst.rq_nvec = 1; rqst.rq_nvec = 1;
/* check if need to ask server to return timestamps in close response */
if (pbuf)
query_attrs = true;
trace_smb3_close_enter(xid, persistent_fid, tcon->tid, ses->Suid); trace_smb3_close_enter(xid, persistent_fid, tcon->tid, ses->Suid);
rc = SMB2_close_init(tcon, &rqst, persistent_fid, volatile_fid); rc = SMB2_close_init(tcon, &rqst, persistent_fid, volatile_fid,
query_attrs);
if (rc) if (rc)
goto close_exit; goto close_exit;
@ -2996,41 +3077,42 @@ SMB2_close_flags(const unsigned int xid, struct cifs_tcon *tcon,
trace_smb3_close_err(xid, persistent_fid, tcon->tid, ses->Suid, trace_smb3_close_err(xid, persistent_fid, tcon->tid, ses->Suid,
rc); rc);
goto close_exit; goto close_exit;
} else } else {
trace_smb3_close_done(xid, persistent_fid, tcon->tid, trace_smb3_close_done(xid, persistent_fid, tcon->tid,
ses->Suid); ses->Suid);
/*
* Note that have to subtract 4 since struct network_open_info
* has a final 4 byte pad that close response does not have
*/
if (pbuf)
memcpy(pbuf, (char *)&rsp->CreationTime, sizeof(*pbuf) - 4);
}
atomic_dec(&tcon->num_remote_opens); atomic_dec(&tcon->num_remote_opens);
/* BB FIXME - decode close response, update inode for caching */
close_exit: close_exit:
SMB2_close_free(&rqst); SMB2_close_free(&rqst);
free_rsp_buf(resp_buftype, rsp); free_rsp_buf(resp_buftype, rsp);
return rc;
}
int
SMB2_close(const unsigned int xid, struct cifs_tcon *tcon,
u64 persistent_fid, u64 volatile_fid)
{
int rc;
int tmp_rc;
rc = SMB2_close_flags(xid, tcon, persistent_fid, volatile_fid, 0);
/* retry close in a worker thread if this one is interrupted */ /* retry close in a worker thread if this one is interrupted */
if (rc == -EINTR) { if (rc == -EINTR) {
int tmp_rc;
tmp_rc = smb2_handle_cancelled_close(tcon, persistent_fid, tmp_rc = smb2_handle_cancelled_close(tcon, persistent_fid,
volatile_fid); volatile_fid);
if (tmp_rc) if (tmp_rc)
cifs_dbg(VFS, "handle cancelled close fid 0x%llx returned error %d\n", cifs_dbg(VFS, "handle cancelled close fid 0x%llx returned error %d\n",
persistent_fid, tmp_rc); persistent_fid, tmp_rc);
} }
return rc; return rc;
} }
int
SMB2_close(const unsigned int xid, struct cifs_tcon *tcon,
u64 persistent_fid, u64 volatile_fid)
{
return __SMB2_close(xid, tcon, persistent_fid, volatile_fid, NULL);
}
int int
smb2_validate_iov(unsigned int offset, unsigned int buffer_length, smb2_validate_iov(unsigned int offset, unsigned int buffer_length,
struct kvec *iov, unsigned int min_buf_size) struct kvec *iov, unsigned int min_buf_size)

21
fs/cifs/smb2pdu.h
View File

@ -25,6 +25,7 @@
#define _SMB2PDU_H #define _SMB2PDU_H
#include <net/sock.h> #include <net/sock.h>
#include <cifsacl.h>
/* /*
* Note that, due to trying to use names similar to the protocol specifications, * Note that, due to trying to use names similar to the protocol specifications,
@ -855,6 +856,15 @@ struct crt_query_id_ctxt {
__u8 Name[8]; __u8 Name[8];
} __packed; } __packed;
struct crt_sd_ctxt {
struct create_context ccontext;
__u8 Name[8];
struct smb3_sd sd;
struct smb3_acl acl;
/* Followed by at least 4 ACEs */
} __packed;
#define COPY_CHUNK_RES_KEY_SIZE 24 #define COPY_CHUNK_RES_KEY_SIZE 24
struct resume_key_req { struct resume_key_req {
char ResumeKey[COPY_CHUNK_RES_KEY_SIZE]; char ResumeKey[COPY_CHUNK_RES_KEY_SIZE];
@ -1570,6 +1580,17 @@ struct smb2_file_eof_info { /* encoding of request for level 10 */
__le64 EndOfFile; /* new end of file value */ __le64 EndOfFile; /* new end of file value */
} __packed; /* level 20 Set */ } __packed; /* level 20 Set */
struct smb2_file_network_open_info {
__le64 CreationTime;
__le64 LastAccessTime;
__le64 LastWriteTime;
__le64 ChangeTime;
__le64 AllocationSize;
__le64 EndOfFile;
__le32 Attributes;
__le32 Reserved;
} __packed; /* level 34 Query also similar returned in close rsp and open rsp */
extern char smb2_padding[7]; extern char smb2_padding[7];
#endif /* _SMB2PDU_H */ #endif /* _SMB2PDU_H */

7
fs/cifs/smb2proto.h
View File

@ -155,12 +155,13 @@ extern int SMB2_change_notify(const unsigned int xid, struct cifs_tcon *tcon,
u64 persistent_fid, u64 volatile_fid, bool watch_tree, u64 persistent_fid, u64 volatile_fid, bool watch_tree,
u32 completion_filter); u32 completion_filter);
extern int __SMB2_close(const unsigned int xid, struct cifs_tcon *tcon,
u64 persistent_fid, u64 volatile_fid,
struct smb2_file_network_open_info *pbuf);
extern int SMB2_close(const unsigned int xid, struct cifs_tcon *tcon, extern int SMB2_close(const unsigned int xid, struct cifs_tcon *tcon,
u64 persistent_file_id, u64 volatile_file_id); u64 persistent_file_id, u64 volatile_file_id);
extern int SMB2_close_flags(const unsigned int xid, struct cifs_tcon *tcon,
u64 persistent_fid, u64 volatile_fid, int flags);
extern int SMB2_close_init(struct cifs_tcon *tcon, struct smb_rqst *rqst, extern int SMB2_close_init(struct cifs_tcon *tcon, struct smb_rqst *rqst,
u64 persistent_file_id, u64 volatile_file_id); u64 persistent_fid, u64 volatile_fid, bool query_attrs);
extern void SMB2_close_free(struct smb_rqst *rqst); extern void SMB2_close_free(struct smb_rqst *rqst);
extern int SMB2_flush(const unsigned int xid, struct cifs_tcon *tcon, extern int SMB2_flush(const unsigned int xid, struct cifs_tcon *tcon,
u64 persistent_file_id, u64 volatile_file_id); u64 persistent_file_id, u64 volatile_file_id);