Commit 8395ebd9 authored by Linus Torvalds's avatar Linus Torvalds

Merge bk://cifs.bkbits.net/linux-2.5cifs

into penguin.transmeta.com:/home/torvalds/v2.5/linux
parents ce4a4076 7d220c8f
...@@ -94,13 +94,17 @@ cifs_read_super(struct super_block *sb, void *data, ...@@ -94,13 +94,17 @@ cifs_read_super(struct super_block *sb, void *data,
sb->s_blocksize_bits = 14; /* default 2**14 = CIFS_MAX_MSGSIZE */ sb->s_blocksize_bits = 14; /* default 2**14 = CIFS_MAX_MSGSIZE */
inode = iget(sb, ROOT_I); inode = iget(sb, ROOT_I);
if (!inode) if (!inode) {
rc = -ENOMEM;
goto out_no_root; goto out_no_root;
}
sb->s_root = d_alloc_root(inode); sb->s_root = d_alloc_root(inode);
if (!sb->s_root) if (!sb->s_root) {
rc = -ENOMEM;
goto out_no_root; goto out_no_root;
}
return 0; return 0;
...@@ -114,7 +118,7 @@ cifs_read_super(struct super_block *sb, void *data, ...@@ -114,7 +118,7 @@ cifs_read_super(struct super_block *sb, void *data,
unload_nls(cifs_sb->local_nls); unload_nls(cifs_sb->local_nls);
if(cifs_sb) if(cifs_sb)
kfree(cifs_sb); kfree(cifs_sb);
return -EINVAL; return rc;
} }
void void
...@@ -332,7 +336,7 @@ struct file_operations cifs_file_ops = { ...@@ -332,7 +336,7 @@ struct file_operations cifs_file_ops = {
.release = cifs_close, .release = cifs_close,
.lock = cifs_lock, .lock = cifs_lock,
.fsync = cifs_fsync, .fsync = cifs_fsync,
.flush = cifs_flush, .flush = cifs_flush,
.mmap = cifs_file_mmap, .mmap = cifs_file_mmap,
.sendfile = generic_file_sendfile, .sendfile = generic_file_sendfile,
}; };
......
...@@ -346,6 +346,7 @@ parse_mount_options(char *options, const char *devname, struct smb_vol *vol) ...@@ -346,6 +346,7 @@ parse_mount_options(char *options, const char *devname, struct smb_vol *vol)
{ {
char *value; char *value;
char *data; char *data;
int temp_len;
memset(vol,0,sizeof(struct smb_vol)); memset(vol,0,sizeof(struct smb_vol));
vol->linux_uid = current->uid; /* current->euid instead? */ vol->linux_uid = current->uid; /* current->euid instead? */
...@@ -398,8 +399,9 @@ parse_mount_options(char *options, const char *devname, struct smb_vol *vol) ...@@ -398,8 +399,9 @@ parse_mount_options(char *options, const char *devname, struct smb_vol *vol)
"CIFS: invalid path to network resource\n"); "CIFS: invalid path to network resource\n");
return 1; /* needs_arg; */ return 1; /* needs_arg; */
} }
if (strnlen(value, 300) < 300) { if ((temp_len = strnlen(value, 300)) < 300) {
vol->UNC = value; vol->UNC = kmalloc(GFP_KERNEL, temp_len);
strcpy(vol->UNC,value);
if (strncmp(vol->UNC, "//", 2) == 0) { if (strncmp(vol->UNC, "//", 2) == 0) {
vol->UNC[0] = '\\'; vol->UNC[0] = '\\';
vol->UNC[1] = '\\'; vol->UNC[1] = '\\';
...@@ -472,8 +474,9 @@ parse_mount_options(char *options, const char *devname, struct smb_vol *vol) ...@@ -472,8 +474,9 @@ parse_mount_options(char *options, const char *devname, struct smb_vol *vol)
printk(KERN_WARNING "CIFS: Missing UNC name for mount target\n"); printk(KERN_WARNING "CIFS: Missing UNC name for mount target\n");
return 1; return 1;
} }
if (strnlen(devname, 300) < 300) { if ((temp_len = strnlen(devname, 300)) < 300) {
vol->UNC = devname; vol->UNC = kmalloc(GFP_KERNEL, temp_len);
strcpy(vol->UNC,devname);
if (strncmp(vol->UNC, "//", 2) == 0) { if (strncmp(vol->UNC, "//", 2) == 0) {
vol->UNC[0] = '\\'; vol->UNC[0] = '\\';
vol->UNC[1] = '\\'; vol->UNC[1] = '\\';
...@@ -812,6 +815,8 @@ cifs_mount(struct super_block *sb, struct cifs_sb_info *cifs_sb, ...@@ -812,6 +815,8 @@ cifs_mount(struct super_block *sb, struct cifs_sb_info *cifs_sb,
cFYI(1, ("Entering cifs_mount. Xid: %d with: %s", xid, mount_data)); cFYI(1, ("Entering cifs_mount. Xid: %d with: %s", xid, mount_data));
if (parse_mount_options(mount_data, devname, &volume_info)) { if (parse_mount_options(mount_data, devname, &volume_info)) {
if(volume_info.UNC)
kfree(volume_info.UNC);
FreeXid(xid); FreeXid(xid);
return -EINVAL; return -EINVAL;
} }
...@@ -852,6 +857,8 @@ cifs_mount(struct super_block *sb, struct cifs_sb_info *cifs_sb, ...@@ -852,6 +857,8 @@ cifs_mount(struct super_block *sb, struct cifs_sb_info *cifs_sb,
("Error connecting to IPv4 socket. Aborting operation")); ("Error connecting to IPv4 socket. Aborting operation"));
if(csocket != NULL) if(csocket != NULL)
sock_release(csocket); sock_release(csocket);
if(volume_info.UNC)
kfree(volume_info.UNC);
FreeXid(xid); FreeXid(xid);
return rc; return rc;
} }
...@@ -860,6 +867,8 @@ cifs_mount(struct super_block *sb, struct cifs_sb_info *cifs_sb, ...@@ -860,6 +867,8 @@ cifs_mount(struct super_block *sb, struct cifs_sb_info *cifs_sb,
if (srvTcp == NULL) { if (srvTcp == NULL) {
rc = -ENOMEM; rc = -ENOMEM;
sock_release(csocket); sock_release(csocket);
if(volume_info.UNC)
kfree(volume_info.UNC);
FreeXid(xid); FreeXid(xid);
return rc; return rc;
} else { } else {
...@@ -943,6 +952,8 @@ cifs_mount(struct super_block *sb, struct cifs_sb_info *cifs_sb, ...@@ -943,6 +952,8 @@ cifs_mount(struct super_block *sb, struct cifs_sb_info *cifs_sb,
"", "",
cifs_sb-> cifs_sb->
local_nls); local_nls);
if(volume_info.UNC)
kfree(volume_info.UNC);
FreeXid(xid); FreeXid(xid);
return -ENODEV; return -ENODEV;
} else { } else {
...@@ -995,7 +1006,8 @@ cifs_mount(struct super_block *sb, struct cifs_sb_info *cifs_sb, ...@@ -995,7 +1006,8 @@ cifs_mount(struct super_block *sb, struct cifs_sb_info *cifs_sb,
if (tcon->ses->capabilities & CAP_UNIX) if (tcon->ses->capabilities & CAP_UNIX)
CIFSSMBQFSUnixInfo(xid, tcon, cifs_sb->local_nls); CIFSSMBQFSUnixInfo(xid, tcon, cifs_sb->local_nls);
} }
if(volume_info.UNC)
kfree(volume_info.UNC);
FreeXid(xid); FreeXid(xid);
return rc; return rc;
} }
...@@ -2293,7 +2305,7 @@ CIFSTCon(unsigned int xid, struct cifsSesInfo *ses, ...@@ -2293,7 +2305,7 @@ CIFSTCon(unsigned int xid, struct cifsSesInfo *ses,
length = strnlen(bcc_ptr, BCC(smb_buffer_response) - 2); length = strnlen(bcc_ptr, BCC(smb_buffer_response) - 2);
/* skip service field (NB: this field is always ASCII) */ /* skip service field (NB: this field is always ASCII) */
bcc_ptr += length + 1; bcc_ptr += length + 1;
strncpy(tcon->treeName, tree, MAX_TREE_SIZE); strncpy(tcon->treeName, tree, MAX_TREE_SIZE);
if (smb_buffer->Flags2 &= SMBFLG2_UNICODE) { if (smb_buffer->Flags2 &= SMBFLG2_UNICODE) {
length = UniStrnlen((wchar_t *) bcc_ptr, 512); length = UniStrnlen((wchar_t *) bcc_ptr, 512);
if (((long) bcc_ptr + (2 * length)) - if (((long) bcc_ptr + (2 * length)) -
......
...@@ -46,7 +46,7 @@ struct smb_to_posix_error { ...@@ -46,7 +46,7 @@ struct smb_to_posix_error {
const struct smb_to_posix_error mapping_table_ERRDOS[] = { const struct smb_to_posix_error mapping_table_ERRDOS[] = {
{ERRbadfunc, -EINVAL}, {ERRbadfunc, -EINVAL},
{ERRbadfile, -ENOENT}, {ERRbadfile, -ENOENT},
{ERRbadpath, -ENOENT}, {ERRbadpath, -ENOTDIR},
{ERRnofids, -EMFILE}, {ERRnofids, -EMFILE},
{ERRnoaccess, -EACCES}, {ERRnoaccess, -EACCES},
{ERRbadfid, -EBADF}, {ERRbadfid, -EBADF},
...@@ -63,26 +63,29 @@ const struct smb_to_posix_error mapping_table_ERRDOS[] = { ...@@ -63,26 +63,29 @@ const struct smb_to_posix_error mapping_table_ERRDOS[] = {
{ERRnofiles, -ENOENT}, {ERRnofiles, -ENOENT},
{ERRbadshare, -ETXTBSY}, {ERRbadshare, -ETXTBSY},
{ERRlock, -EACCES}, {ERRlock, -EACCES},
{ERRfilexists, -EINVAL}, {ERRunsup, -EINVAL},
{ERRnosuchshare,-ENXIO},
{ERRfilexists, -EEXIST},
{ERRinvparm, -EINVAL}, {ERRinvparm, -EINVAL},
{ERRdiskfull, -ENOSPC}, {ERRdiskfull, -ENOSPC},
{ERRinvnum, -EINVAL}, {ERRinvname, -ENOENT},
{ERRdirnotempty, -ENOTEMPTY}, {ERRdirnotempty, -ENOTEMPTY},
{ERRnotlocked, -ENOLCK}, {ERRnotlocked, -ENOLCK},
{ERRalreadyexists, -EEXIST}, {ERRalreadyexists, -EEXIST},
{ERRmoredata, -EOVERFLOW}, {ERRmoredata, -EOVERFLOW},
{ErrQuota, -EDQUOT}, {ErrQuota, -EDQUOT},
{ErrNotALink, -ENOLINK}, {ErrNotALink, -ENOLINK},
{ERRnetlogonNotStarted,-ENOPROTOOPT},
{0, 0} {0, 0}
}; };
const struct smb_to_posix_error mapping_table_ERRSRV[] = { const struct smb_to_posix_error mapping_table_ERRSRV[] = {
{ERRerror, -EIO}, {ERRerror, -EIO},
{ERRbadpw, -EACCES}, {ERRbadpw, -EPERM},
{ERRbadtype, -EREMOTE}, {ERRbadtype, -EREMOTE},
{ERRaccess, -EACCES}, {ERRaccess, -EACCES},
{ERRinvtid, -ENXIO}, {ERRinvtid, -ENXIO},
{ERRinvnetname, -ENOENT}, {ERRinvnetname, -ENODEV},
{ERRinvdevice, -ENXIO}, {ERRinvdevice, -ENXIO},
{ERRqfull, -ENOSPC}, {ERRqfull, -ENOSPC},
{ERRqtoobig, -ENOSPC}, {ERRqtoobig, -ENOSPC},
...@@ -617,7 +620,7 @@ static const struct { ...@@ -617,7 +620,7 @@ static const struct {
ERRHRD, ERRgeneral, NT_STATUS_EVENTLOG_CANT_START}, { ERRHRD, ERRgeneral, NT_STATUS_EVENTLOG_CANT_START}, {
ERRDOS, ERRnoaccess, NT_STATUS_TRUST_FAILURE}, { ERRDOS, ERRnoaccess, NT_STATUS_TRUST_FAILURE}, {
ERRHRD, ERRgeneral, NT_STATUS_MUTANT_LIMIT_EXCEEDED}, { ERRHRD, ERRgeneral, NT_STATUS_MUTANT_LIMIT_EXCEEDED}, {
ERRDOS, 2455, NT_STATUS_NETLOGON_NOT_STARTED}, { ERRDOS, ERRnetlogonNotStarted, NT_STATUS_NETLOGON_NOT_STARTED}, {
ERRSRV, 2239, NT_STATUS_ACCOUNT_EXPIRED}, { ERRSRV, 2239, NT_STATUS_ACCOUNT_EXPIRED}, {
ERRHRD, ERRgeneral, NT_STATUS_POSSIBLE_DEADLOCK}, { ERRHRD, ERRgeneral, NT_STATUS_POSSIBLE_DEADLOCK}, {
ERRHRD, ERRgeneral, NT_STATUS_NETWORK_CREDENTIAL_CONFLICT}, { ERRHRD, ERRgeneral, NT_STATUS_NETWORK_CREDENTIAL_CONFLICT}, {
......
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
#define ERRfilexists 80 /* The file named in the request already exists. */ #define ERRfilexists 80 /* The file named in the request already exists. */
#define ERRinvparm 87 #define ERRinvparm 87
#define ERRdiskfull 112 #define ERRdiskfull 112
#define ERRinvnum 123 #define ERRinvname 123
#define ERRdirnotempty 145 #define ERRdirnotempty 145
#define ERRnotlocked 158 #define ERRnotlocked 158
#define ERRalreadyexists 183 #define ERRalreadyexists 183
...@@ -109,4 +109,5 @@ class.*/ ...@@ -109,4 +109,5 @@ class.*/
#define ERRbadclient 2240 #define ERRbadclient 2240
#define ERRbadLogonTime 2241 #define ERRbadLogonTime 2241
#define ERRpasswordExpired 2242 #define ERRpasswordExpired 2242
#define ERRnetlogonNotStarted 2455
#define ERRnosupport 0xFFFF #define ERRnosupport 0xFFFF
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment