diff options
Diffstat (limited to 'fs')
-rw-r--r-- | fs/Kconfig | 14 | ||||
-rw-r--r-- | fs/binfmt_elf_fdpic.c | 3 |
2 files changed, 5 insertions, 12 deletions
diff --git a/fs/Kconfig b/fs/Kconfig index b3b5aa0edff9..276ff3baaafe 100644 --- a/fs/Kconfig +++ b/fs/Kconfig | |||
@@ -12,9 +12,7 @@ config EXT2_FS | |||
12 | Ext2 is a standard Linux file system for hard disks. | 12 | Ext2 is a standard Linux file system for hard disks. |
13 | 13 | ||
14 | To compile this file system support as a module, choose M here: the | 14 | To compile this file system support as a module, choose M here: the |
15 | module will be called ext2. Be aware however that the file system | 15 | module will be called ext2. |
16 | of your root partition (the one containing the directory /) cannot | ||
17 | be compiled as a module, and so this could be dangerous. | ||
18 | 16 | ||
19 | If unsure, say Y. | 17 | If unsure, say Y. |
20 | 18 | ||
@@ -98,9 +96,7 @@ config EXT3_FS | |||
98 | (available at <http://sourceforge.net/projects/e2fsprogs/>). | 96 | (available at <http://sourceforge.net/projects/e2fsprogs/>). |
99 | 97 | ||
100 | To compile this file system support as a module, choose M here: the | 98 | To compile this file system support as a module, choose M here: the |
101 | module will be called ext3. Be aware however that the file system | 99 | module will be called ext3. |
102 | of your root partition (the one containing the directory /) cannot | ||
103 | be compiled as a module, and so this may be dangerous. | ||
104 | 100 | ||
105 | config EXT3_FS_XATTR | 101 | config EXT3_FS_XATTR |
106 | bool "Ext3 extended attributes" | 102 | bool "Ext3 extended attributes" |
@@ -163,9 +159,7 @@ config EXT4DEV_FS | |||
163 | features will be added to ext4dev gradually. | 159 | features will be added to ext4dev gradually. |
164 | 160 | ||
165 | To compile this file system support as a module, choose M here. The | 161 | To compile this file system support as a module, choose M here. The |
166 | module will be called ext4dev. Be aware, however, that the filesystem | 162 | module will be called ext4dev. |
167 | of your root partition (the one containing the directory /) cannot | ||
168 | be compiled as a module, and so this could be dangerous. | ||
169 | 163 | ||
170 | If unsure, say N. | 164 | If unsure, say N. |
171 | 165 | ||
@@ -1008,7 +1002,7 @@ config TMPFS_POSIX_ACL | |||
1008 | 1002 | ||
1009 | config HUGETLBFS | 1003 | config HUGETLBFS |
1010 | bool "HugeTLB file system support" | 1004 | bool "HugeTLB file system support" |
1011 | depends X86 || IA64 || PPC64 || SPARC64 || SUPERH || BROKEN | 1005 | depends on X86 || IA64 || PPC64 || SPARC64 || SUPERH || BROKEN |
1012 | help | 1006 | help |
1013 | hugetlbfs is a filesystem backing for HugeTLB pages, based on | 1007 | hugetlbfs is a filesystem backing for HugeTLB pages, based on |
1014 | ramfs. For architectures that support it, say Y here and read | 1008 | ramfs. For architectures that support it, say Y here and read |
diff --git a/fs/binfmt_elf_fdpic.c b/fs/binfmt_elf_fdpic.c index 76f06f6bc2f6..6e6d4568d548 100644 --- a/fs/binfmt_elf_fdpic.c +++ b/fs/binfmt_elf_fdpic.c | |||
@@ -706,12 +706,11 @@ static int elf_fdpic_map_file(struct elf_fdpic_params *params, | |||
706 | return -ELIBBAD; | 706 | return -ELIBBAD; |
707 | 707 | ||
708 | size = sizeof(*loadmap) + nloads * sizeof(*seg); | 708 | size = sizeof(*loadmap) + nloads * sizeof(*seg); |
709 | loadmap = kmalloc(size, GFP_KERNEL); | 709 | loadmap = kzalloc(size, GFP_KERNEL); |
710 | if (!loadmap) | 710 | if (!loadmap) |
711 | return -ENOMEM; | 711 | return -ENOMEM; |
712 | 712 | ||
713 | params->loadmap = loadmap; | 713 | params->loadmap = loadmap; |
714 | memset(loadmap, 0, size); | ||
715 | 714 | ||
716 | loadmap->version = ELF32_FDPIC_LOADMAP_VERSION; | 715 | loadmap->version = ELF32_FDPIC_LOADMAP_VERSION; |
717 | loadmap->nsegs = nloads; | 716 | loadmap->nsegs = nloads; |