git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ecryptfs: don't allow mmap when the lower fs doesn't support it
[pandora-kernel.git]
/
fs
/
cifs
/
cifs_dfs_ref.c
diff --git
a/fs/cifs/cifs_dfs_ref.c
b/fs/cifs/cifs_dfs_ref.c
index
6873bb6
..
d0e5fc5
100644
(file)
--- a/
fs/cifs/cifs_dfs_ref.c
+++ b/
fs/cifs/cifs_dfs_ref.c
@@
-18,6
+18,7
@@
#include <linux/slab.h>
#include <linux/vfs.h>
#include <linux/fs.h>
#include <linux/slab.h>
#include <linux/vfs.h>
#include <linux/fs.h>
+#include <linux/inet.h>
#include "cifsglob.h"
#include "cifsproto.h"
#include "cifsfs.h"
#include "cifsglob.h"
#include "cifsproto.h"
#include "cifsfs.h"
@@
-150,7
+151,8
@@
char *cifs_compose_mount_options(const char *sb_mountdata,
* assuming that we have 'unc=' and 'ip=' in
* the original sb_mountdata
*/
* assuming that we have 'unc=' and 'ip=' in
* the original sb_mountdata
*/
- md_len = strlen(sb_mountdata) + rc + strlen(ref->node_name) + 12;
+ md_len = strlen(sb_mountdata) + rc + strlen(ref->node_name) + 12 +
+ INET6_ADDRSTRLEN;
mountdata = kzalloc(md_len+1, GFP_KERNEL);
if (mountdata == NULL) {
rc = -ENOMEM;
mountdata = kzalloc(md_len+1, GFP_KERNEL);
if (mountdata == NULL) {
rc = -ENOMEM;
@@
-226,6
+228,8
@@
compose_mount_options_out:
compose_mount_options_err:
kfree(mountdata);
mountdata = ERR_PTR(rc);
compose_mount_options_err:
kfree(mountdata);
mountdata = ERR_PTR(rc);
+ kfree(*devname);
+ *devname = NULL;
goto compose_mount_options_out;
}
goto compose_mount_options_out;
}