original development tree for Linux kernel GTP module; now long in mainline.
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

184 lines
4.7 KiB

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h percpu.h is included by sched.h and module.h and thus ends up being included when building most .c files. percpu.h includes slab.h which in turn includes gfp.h making everything defined by the two files universally available and complicating inclusion dependencies. percpu.h -> slab.h dependency is about to be removed. Prepare for this change by updating users of gfp and slab facilities include those headers directly instead of assuming availability. As this conversion needs to touch large number of source files, the following script is used as the basis of conversion. http://userweb.kernel.org/~tj/misc/slabh-sweep.py The script does the followings. * Scan files for gfp and slab usages and update includes such that only the necessary includes are there. ie. if only gfp is used, gfp.h, if slab is used, slab.h. * When the script inserts a new include, it looks at the include blocks and try to put the new include such that its order conforms to its surrounding. It's put in the include block which contains core kernel includes, in the same order that the rest are ordered - alphabetical, Christmas tree, rev-Xmas-tree or at the end if there doesn't seem to be any matching order. * If the script can't find a place to put a new include (mostly because the file doesn't have fitting include block), it prints out an error message indicating which .h file needs to be added to the file. The conversion was done in the following steps. 1. The initial automatic conversion of all .c files updated slightly over 4000 files, deleting around 700 includes and adding ~480 gfp.h and ~3000 slab.h inclusions. The script emitted errors for ~400 files. 2. Each error was manually checked. Some didn't need the inclusion, some needed manual addition while adding it to implementation .h or embedding .c file was more appropriate for others. This step added inclusions to around 150 files. 3. The script was run again and the output was compared to the edits from #2 to make sure no file was left behind. 4. Several build tests were done and a couple of problems were fixed. e.g. lib/decompress_*.c used malloc/free() wrappers around slab APIs requiring slab.h to be added manually. 5. The script was run on all .h files but without automatically editing them as sprinkling gfp.h and slab.h inclusions around .h files could easily lead to inclusion dependency hell. Most gfp.h inclusion directives were ignored as stuff from gfp.h was usually wildly available and often used in preprocessor macros. Each slab.h inclusion directive was examined and added manually as necessary. 6. percpu.h was updated not to include slab.h. 7. Build test were done on the following configurations and failures were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my distributed build env didn't work with gcov compiles) and a few more options had to be turned off depending on archs to make things build (like ipr on powerpc/64 which failed due to missing writeq). * x86 and x86_64 UP and SMP allmodconfig and a custom test config. * powerpc and powerpc64 SMP allmodconfig * sparc and sparc64 SMP allmodconfig * ia64 SMP allmodconfig * s390 SMP allmodconfig * alpha SMP allmodconfig * um on x86_64 SMP allmodconfig 8. percpu.h modifications were reverted so that it could be applied as a separate patch and serve as bisection point. Given the fact that I had only a couple of failures from tests on step 6, I'm fairly confident about the coverage of this conversion patch. If there is a breakage, it's likely to be something in one of the arch headers which should be easily discoverable easily on most builds of the specific arch. Signed-off-by: Tejun Heo <tj@kernel.org> Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org> Cc: Ingo Molnar <mingo@redhat.com> Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
12 years ago
fs: Limit sys_mount to only request filesystem modules. Modify the request_module to prefix the file system type with "fs-" and add aliases to all of the filesystems that can be built as modules to match. A common practice is to build all of the kernel code and leave code that is not commonly needed as modules, with the result that many users are exposed to any bug anywhere in the kernel. Looking for filesystems with a fs- prefix limits the pool of possible modules that can be loaded by mount to just filesystems trivially making things safer with no real cost. Using aliases means user space can control the policy of which filesystem modules are auto-loaded by editing /etc/modprobe.d/*.conf with blacklist and alias directives. Allowing simple, safe, well understood work-arounds to known problematic software. This also addresses a rare but unfortunate problem where the filesystem name is not the same as it's module name and module auto-loading would not work. While writing this patch I saw a handful of such cases. The most significant being autofs that lives in the module autofs4. This is relevant to user namespaces because we can reach the request module in get_fs_type() without having any special permissions, and people get uncomfortable when a user specified string (in this case the filesystem type) goes all of the way to request_module. After having looked at this issue I don't think there is any particular reason to perform any filtering or permission checks beyond making it clear in the module request that we want a filesystem module. The common pattern in the kernel is to call request_module() without regards to the users permissions. In general all a filesystem module does once loaded is call register_filesystem() and go to sleep. Which means there is not much attack surface exposed by loading a filesytem module unless the filesystem is mounted. In a user namespace filesystems are not mounted unless .fs_flags = FS_USERNS_MOUNT, which most filesystems do not set today. Acked-by: Serge Hallyn <serge.hallyn@canonical.com> Acked-by: Kees Cook <keescook@chromium.org> Reported-by: Kees Cook <keescook@google.com> Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
9 years ago
  1. /* -*- mode: c; c-basic-offset: 8; -*-
  2. * vim: noexpandtab sw=8 ts=8 sts=0:
  3. *
  4. * mount.c - operations for initializing and mounting configfs.
  5. *
  6. * This program is free software; you can redistribute it and/or
  7. * modify it under the terms of the GNU General Public
  8. * License as published by the Free Software Foundation; either
  9. * version 2 of the License, or (at your option) any later version.
  10. *
  11. * This program is distributed in the hope that it will be useful,
  12. * but WITHOUT ANY WARRANTY; without even the implied warranty of
  13. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
  14. * General Public License for more details.
  15. *
  16. * You should have received a copy of the GNU General Public
  17. * License along with this program; if not, write to the
  18. * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  19. * Boston, MA 021110-1307, USA.
  20. *
  21. * Based on sysfs:
  22. * sysfs is Copyright (C) 2001, 2002, 2003 Patrick Mochel
  23. *
  24. * configfs Copyright (C) 2005 Oracle. All rights reserved.
  25. */
  26. #include <linux/fs.h>
  27. #include <linux/module.h>
  28. #include <linux/mount.h>
  29. #include <linux/pagemap.h>
  30. #include <linux/init.h>
  31. #include <linux/slab.h>
  32. #include <linux/configfs.h>
  33. #include "configfs_internal.h"
  34. /* Random magic number */
  35. #define CONFIGFS_MAGIC 0x62656570
  36. static struct vfsmount *configfs_mount = NULL;
  37. struct kmem_cache *configfs_dir_cachep;
  38. static int configfs_mnt_count = 0;
  39. static const struct super_operations configfs_ops = {
  40. .statfs = simple_statfs,
  41. .drop_inode = generic_delete_inode,
  42. };
  43. static struct config_group configfs_root_group = {
  44. .cg_item = {
  45. .ci_namebuf = "root",
  46. .ci_name = configfs_root_group.cg_item.ci_namebuf,
  47. },
  48. };
  49. int configfs_is_root(struct config_item *item)
  50. {
  51. return item == &configfs_root_group.cg_item;
  52. }
  53. static struct configfs_dirent configfs_root = {
  54. .s_sibling = LIST_HEAD_INIT(configfs_root.s_sibling),
  55. .s_children = LIST_HEAD_INIT(configfs_root.s_children),
  56. .s_element = &configfs_root_group.cg_item,
  57. .s_type = CONFIGFS_ROOT,
  58. .s_iattr = NULL,
  59. };
  60. static int configfs_fill_super(struct super_block *sb, void *data, int silent)
  61. {
  62. struct inode *inode;
  63. struct dentry *root;
  64. sb->s_blocksize = PAGE_CACHE_SIZE;
  65. sb->s_blocksize_bits = PAGE_CACHE_SHIFT;
  66. sb->s_magic = CONFIGFS_MAGIC;
  67. sb->s_op = &configfs_ops;
  68. sb->s_time_gran = 1;
  69. inode = configfs_new_inode(S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO,
  70. &configfs_root, sb);
  71. if (inode) {
  72. inode->i_op = &configfs_root_inode_operations;
  73. inode->i_fop = &configfs_dir_operations;
  74. /* directory inodes start off with i_nlink == 2 (for "." entry) */
  75. inc_nlink(inode);
  76. } else {
  77. pr_debug("configfs: could not get root inode\n");
  78. return -ENOMEM;
  79. }
  80. root = d_make_root(inode);
  81. if (!root) {
  82. pr_debug("%s: could not get root dentry!\n",__func__);
  83. return -ENOMEM;
  84. }
  85. config_group_init(&configfs_root_group);
  86. configfs_root_group.cg_item.ci_dentry = root;
  87. root->d_fsdata = &configfs_root;
  88. sb->s_root = root;
  89. sb->s_d_op = &configfs_dentry_ops; /* the rest get that */
  90. return 0;
  91. }
  92. static struct dentry *configfs_do_mount(struct file_system_type *fs_type,
  93. int flags, const char *dev_name, void *data)
  94. {
  95. return mount_single(fs_type, flags, data, configfs_fill_super);
  96. }
  97. static struct file_system_type configfs_fs_type = {
  98. .owner = THIS_MODULE,
  99. .name = "configfs",
  100. .mount = configfs_do_mount,
  101. .kill_sb = kill_litter_super,
  102. };
  103. MODULE_ALIAS_FS("configfs");
  104. struct dentry *configfs_pin_fs(void)
  105. {
  106. int err = simple_pin_fs(&configfs_fs_type, &configfs_mount,
  107. &configfs_mnt_count);
  108. return err ? ERR_PTR(err) : configfs_mount->mnt_root;
  109. }
  110. void configfs_release_fs(void)
  111. {
  112. simple_release_fs(&configfs_mount, &configfs_mnt_count);
  113. }
  114. static struct kobject *config_kobj;
  115. static int __init configfs_init(void)
  116. {
  117. int err = -ENOMEM;
  118. configfs_dir_cachep = kmem_cache_create("configfs_dir_cache",
  119. sizeof(struct configfs_dirent),
  120. 0, 0, NULL);
  121. if (!configfs_dir_cachep)
  122. goto out;
  123. config_kobj = kobject_create_and_add("config", kernel_kobj);
  124. if (!config_kobj)
  125. goto out2;
  126. err = configfs_inode_init();
  127. if (err)
  128. goto out3;
  129. err = register_filesystem(&configfs_fs_type);
  130. if (err)
  131. goto out4;
  132. return 0;
  133. out4:
  134. printk(KERN_ERR "configfs: Unable to register filesystem!\n");
  135. configfs_inode_exit();
  136. out3:
  137. kobject_put(config_kobj);
  138. out2:
  139. kmem_cache_destroy(configfs_dir_cachep);
  140. configfs_dir_cachep = NULL;
  141. out:
  142. return err;
  143. }
  144. static void __exit configfs_exit(void)
  145. {
  146. unregister_filesystem(&configfs_fs_type);
  147. kobject_put(config_kobj);
  148. kmem_cache_destroy(configfs_dir_cachep);
  149. configfs_dir_cachep = NULL;
  150. configfs_inode_exit();
  151. }
  152. MODULE_AUTHOR("Oracle");
  153. MODULE_LICENSE("GPL");
  154. MODULE_VERSION("0.0.2");
  155. MODULE_DESCRIPTION("Simple RAM filesystem for user driven kernel subsystem configuration.");
  156. module_init(configfs_init);
  157. module_exit(configfs_exit);