projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mm/memunmap: don't access uninitialized memmap in memunmap_pages()
[linux-2.6-block.git]
/
fs
/
namespace.c
diff --git
a/fs/namespace.c
b/fs/namespace.c
index 93c043245c463eb77c4c48316e8ba8ae80f47830..fe0e9e1410fee30b05b725582ae460f66f997351 100644
(file)
--- a/
fs/namespace.c
+++ b/
fs/namespace.c
@@
-2802,8
+2802,6
@@
static int do_new_mount(struct path *path, const char *fstype, int sb_flags,
put_filesystem(type);
return -EINVAL;
}
put_filesystem(type);
return -EINVAL;
}
- } else {
- subtype = "";
}
}
}
}
@@
-3028,7
+3026,7
@@
void *copy_mount_options(const void __user * data)
* the remainder of the page.
*/
/* copy_from_user cannot cross TASK_SIZE ! */
* the remainder of the page.
*/
/* copy_from_user cannot cross TASK_SIZE ! */
- size = TASK_SIZE - (unsigned long)
data
;
+ size = TASK_SIZE - (unsigned long)
untagged_addr(data)
;
if (size > PAGE_SIZE)
size = PAGE_SIZE;
if (size > PAGE_SIZE)
size = PAGE_SIZE;