From c48d85dc1abb85d903c12ef31292e633c19e62ff Mon Sep 17 00:00:00 2001 From: Cyrill Gorcunov Date: Sat, 18 Aug 2007 00:15:20 +0000 Subject: [PATCH] --- yaml --- r: 64033 b: refs/heads/master c: 5e6e6232753482dc0024a319b9d8f611d7a80c19 h: refs/heads/master i: 64031: 027a8c479e403934d6a2404b5b1d1943d5c67d44 v: v3 --- [refs] | 2 +- trunk/fs/cifs/README | 6 ++++++ trunk/fs/cifs/sess.c | 4 ++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 18891c10e238..4b5f4fed75c7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: af5a032b8082cddb4dc62a9ff94bf1ec4d34a044 +refs/heads/master: 5e6e6232753482dc0024a319b9d8f611d7a80c19 diff --git a/trunk/fs/cifs/README b/trunk/fs/cifs/README index fa096f9c824d..b806b11b5560 100644 --- a/trunk/fs/cifs/README +++ b/trunk/fs/cifs/README @@ -458,6 +458,12 @@ A partial list of the supported mount options follows: byte range locks). remount remount the share (often used to change from ro to rw mounts or vice versa) + servern Specify the server 's netbios name (RFC1001 name) to use + when attempting to setup a session to the server. This is + This is needed for mounting to some older servers (such + as OS/2 or Windows 98 and Windows ME) since they do not + support a default server name. A server name can be up + to 15 characters long and is usually uppercased. sfu When the CIFS Unix Extensions are not negotiated, attempt to create device files and fifos in a format compatible with Services for Unix (SFU). In addition retrieve bits 10-12 diff --git a/trunk/fs/cifs/sess.c b/trunk/fs/cifs/sess.c index 2ea027dda215..892be9b4d1f3 100644 --- a/trunk/fs/cifs/sess.c +++ b/trunk/fs/cifs/sess.c @@ -372,6 +372,10 @@ CIFS_SessSetup(unsigned int xid, struct cifsSesInfo *ses, int first_time, /* 2000 big enough to fit max user, domain, NOS name etc. */ str_area = kmalloc(2000, GFP_KERNEL); + if (str_area == NULL) { + cifs_small_buf_release(smb_buf); + return -ENOMEM; + } bcc_ptr = str_area; ses->flags &= ~CIFS_SES_LANMAN;