forked from luck/tmp_suning_uos_patched
Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6
Pull CIFS fixes from Steve French: "Three small CIFS Fixes (the most important of the three fixes a recent problem authenticating to Windows 8 using cifs rather than SMB2)" * 'for-next' of git://git.samba.org/sfrench/cifs-2.6: cifs: ignore everything in SPNEGO blob after mechTypes cifs: delay super block destruction until all cifsFileInfo objects are gone cifs: map NT_STATUS_SHARING_VIOLATION to EBUSY instead of ETXTBSY
This commit is contained in:
Linus Torvalds
commit
9217cbb8df
|
|
@ -614,53 +614,10 @@ decode_negTokenInit(unsigned char *security_blob, int length,
|
|||
}
|
||||
}
|
||||
|
||||
/* mechlistMIC */
|
||||
if (asn1_header_decode(&ctx, &end, &cls, &con, &tag) == 0) {
|
||||
/* Check if we have reached the end of the blob, but with
|
||||
no mechListMic (e.g. NTLMSSP instead of KRB5) */
|
||||
if (ctx.error == ASN1_ERR_DEC_EMPTY)
|
||||
goto decode_negtoken_exit;
|
||||
cFYI(1, "Error decoding last part negTokenInit exit3");
|
||||
return 0;
|
||||
} else if ((cls != ASN1_CTX) || (con != ASN1_CON)) {
|
||||
/* tag = 3 indicating mechListMIC */
|
||||
cFYI(1, "Exit 4 cls = %d con = %d tag = %d end = %p (%d)",
|
||||
cls, con, tag, end, *end);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* sequence */
|
||||
if (asn1_header_decode(&ctx, &end, &cls, &con, &tag) == 0) {
|
||||
cFYI(1, "Error decoding last part negTokenInit exit5");
|
||||
return 0;
|
||||
} else if ((cls != ASN1_UNI) || (con != ASN1_CON)
|
||||
|| (tag != ASN1_SEQ)) {
|
||||
cFYI(1, "cls = %d con = %d tag = %d end = %p (%d)",
|
||||
cls, con, tag, end, *end);
|
||||
}
|
||||
|
||||
/* sequence of */
|
||||
if (asn1_header_decode(&ctx, &end, &cls, &con, &tag) == 0) {
|
||||
cFYI(1, "Error decoding last part negTokenInit exit 7");
|
||||
return 0;
|
||||
} else if ((cls != ASN1_CTX) || (con != ASN1_CON)) {
|
||||
cFYI(1, "Exit 8 cls = %d con = %d tag = %d end = %p (%d)",
|
||||
cls, con, tag, end, *end);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* general string */
|
||||
if (asn1_header_decode(&ctx, &end, &cls, &con, &tag) == 0) {
|
||||
cFYI(1, "Error decoding last part negTokenInit exit9");
|
||||
return 0;
|
||||
} else if ((cls != ASN1_UNI) || (con != ASN1_PRI)
|
||||
|| (tag != ASN1_GENSTR)) {
|
||||
cFYI(1, "Exit10 cls = %d con = %d tag = %d end = %p (%d)",
|
||||
cls, con, tag, end, *end);
|
||||
return 0;
|
||||
}
|
||||
cFYI(1, "Need to call asn1_octets_decode() function for %s",
|
||||
ctx.pointer); /* is this UTF-8 or ASCII? */
|
||||
decode_negtoken_exit:
|
||||
/*
|
||||
* We currently ignore anything at the end of the SPNEGO blob after
|
||||
* the mechTypes have been parsed, since none of that info is
|
||||
* used at the moment.
|
||||
*/
|
||||
return 1;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -91,6 +91,30 @@ struct workqueue_struct *cifsiod_wq;
|
|||
__u8 cifs_client_guid[SMB2_CLIENT_GUID_SIZE];
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Bumps refcount for cifs super block.
|
||||
* Note that it should be only called if a referece to VFS super block is
|
||||
* already held, e.g. in open-type syscalls context. Otherwise it can race with
|
||||
* atomic_dec_and_test in deactivate_locked_super.
|
||||
*/
|
||||
void
|
||||
cifs_sb_active(struct super_block *sb)
|
||||
{
|
||||
struct cifs_sb_info *server = CIFS_SB(sb);
|
||||
|
||||
if (atomic_inc_return(&server->active) == 1)
|
||||
atomic_inc(&sb->s_active);
|
||||
}
|
||||
|
||||
void
|
||||
cifs_sb_deactive(struct super_block *sb)
|
||||
{
|
||||
struct cifs_sb_info *server = CIFS_SB(sb);
|
||||
|
||||
if (atomic_dec_and_test(&server->active))
|
||||
deactivate_super(sb);
|
||||
}
|
||||
|
||||
static int
|
||||
cifs_read_super(struct super_block *sb)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -41,6 +41,10 @@ extern struct file_system_type cifs_fs_type;
|
|||
extern const struct address_space_operations cifs_addr_ops;
|
||||
extern const struct address_space_operations cifs_addr_ops_smallbuf;
|
||||
|
||||
/* Functions related to super block operations */
|
||||
extern void cifs_sb_active(struct super_block *sb);
|
||||
extern void cifs_sb_deactive(struct super_block *sb);
|
||||
|
||||
/* Functions related to inodes */
|
||||
extern const struct inode_operations cifs_dir_inode_ops;
|
||||
extern struct inode *cifs_root_iget(struct super_block *);
|
||||
|
|
|
|||
|
|
@ -300,6 +300,8 @@ cifs_new_fileinfo(struct cifs_fid *fid, struct file *file,
|
|||
INIT_WORK(&cfile->oplock_break, cifs_oplock_break);
|
||||
mutex_init(&cfile->fh_mutex);
|
||||
|
||||
cifs_sb_active(inode->i_sb);
|
||||
|
||||
/*
|
||||
* If the server returned a read oplock and we have mandatory brlocks,
|
||||
* set oplock level to None.
|
||||
|
|
@ -349,7 +351,8 @@ void cifsFileInfo_put(struct cifsFileInfo *cifs_file)
|
|||
struct cifs_tcon *tcon = tlink_tcon(cifs_file->tlink);
|
||||
struct TCP_Server_Info *server = tcon->ses->server;
|
||||
struct cifsInodeInfo *cifsi = CIFS_I(inode);
|
||||
struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb);
|
||||
struct super_block *sb = inode->i_sb;
|
||||
struct cifs_sb_info *cifs_sb = CIFS_SB(sb);
|
||||
struct cifsLockInfo *li, *tmp;
|
||||
struct cifs_fid fid;
|
||||
struct cifs_pending_open open;
|
||||
|
|
@ -414,6 +417,7 @@ void cifsFileInfo_put(struct cifsFileInfo *cifs_file)
|
|||
|
||||
cifs_put_tlink(cifs_file->tlink);
|
||||
dput(cifs_file->dentry);
|
||||
cifs_sb_deactive(sb);
|
||||
kfree(cifs_file);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1043,7 +1043,7 @@ cifs_rename_pending_delete(const char *full_path, struct dentry *dentry,
|
|||
cifs_sb->mnt_cifs_flags &
|
||||
CIFS_MOUNT_MAP_SPECIAL_CHR);
|
||||
if (rc != 0) {
|
||||
rc = -ETXTBSY;
|
||||
rc = -EBUSY;
|
||||
goto undo_setattr;
|
||||
}
|
||||
|
||||
|
|
@ -1062,7 +1062,7 @@ cifs_rename_pending_delete(const char *full_path, struct dentry *dentry,
|
|||
if (rc == -ENOENT)
|
||||
rc = 0;
|
||||
else if (rc != 0) {
|
||||
rc = -ETXTBSY;
|
||||
rc = -EBUSY;
|
||||
goto undo_rename;
|
||||
}
|
||||
cifsInode->delete_pending = true;
|
||||
|
|
@ -1169,15 +1169,13 @@ int cifs_unlink(struct inode *dir, struct dentry *dentry)
|
|||
cifs_drop_nlink(inode);
|
||||
} else if (rc == -ENOENT) {
|
||||
d_drop(dentry);
|
||||
} else if (rc == -ETXTBSY) {
|
||||
} else if (rc == -EBUSY) {
|
||||
if (server->ops->rename_pending_delete) {
|
||||
rc = server->ops->rename_pending_delete(full_path,
|
||||
dentry, xid);
|
||||
if (rc == 0)
|
||||
cifs_drop_nlink(inode);
|
||||
}
|
||||
if (rc == -ETXTBSY)
|
||||
rc = -EBUSY;
|
||||
} else if ((rc == -EACCES) && (dosattr == 0) && inode) {
|
||||
attrs = kzalloc(sizeof(*attrs), GFP_KERNEL);
|
||||
if (attrs == NULL) {
|
||||
|
|
@ -1518,7 +1516,7 @@ cifs_do_rename(const unsigned int xid, struct dentry *from_dentry,
|
|||
* source. Note that cross directory moves do not work with
|
||||
* rename by filehandle to various Windows servers.
|
||||
*/
|
||||
if (rc == 0 || rc != -ETXTBSY)
|
||||
if (rc == 0 || rc != -EBUSY)
|
||||
goto do_rename_exit;
|
||||
|
||||
/* open-file renames don't work across directories */
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ static const struct smb_to_posix_error mapping_table_ERRDOS[] = {
|
|||
{ERRdiffdevice, -EXDEV},
|
||||
{ERRnofiles, -ENOENT},
|
||||
{ERRwriteprot, -EROFS},
|
||||
{ERRbadshare, -ETXTBSY},
|
||||
{ERRbadshare, -EBUSY},
|
||||
{ERRlock, -EACCES},
|
||||
{ERRunsup, -EINVAL},
|
||||
{ERRnosuchshare, -ENXIO},
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user