aboutsummaryrefslogtreecommitdiffstats
path: root/fs/cifs/cifssmb.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-05-20 08:36:53 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-05-20 08:36:53 -0700
commit929a8651f42544f2b94ec149dfb2901e0c0ee427 (patch)
treed2bc6f6c2fe64336263ab651c3bc0670ed71a68a /fs/cifs/cifssmb.c
parenta71d6e0d6fe098cda4e5de1ceb202b64f963f60c (diff)
parent8b6427a2a8f7dd43e9208fb33a3b116d66db4979 (diff)
downloadkernel_samsung_smdk4412-929a8651f42544f2b94ec149dfb2901e0c0ee427.zip
kernel_samsung_smdk4412-929a8651f42544f2b94ec149dfb2901e0c0ee427.tar.gz
kernel_samsung_smdk4412-929a8651f42544f2b94ec149dfb2901e0c0ee427.tar.bz2
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6: cifs: fix pointer initialization and checks in cifs_follow_symlink (try #4)
Diffstat (limited to 'fs/cifs/cifssmb.c')
-rw-r--r--fs/cifs/cifssmb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c
index 5759ba5..d062602 100644
--- a/fs/cifs/cifssmb.c
+++ b/fs/cifs/cifssmb.c
@@ -2475,7 +2475,7 @@ querySymLinkRetry:
/* BB FIXME investigate remapping reserved chars here */
*symlinkinfo = cifs_strndup_from_ucs(data_start, count,
is_unicode, nls_codepage);
- if (!symlinkinfo)
+ if (!*symlinkinfo)
rc = -ENOMEM;
}
}