On Thu, 2016-01-21 at 01:03 +0100, Luis R. Rodriguez wrote: > On Mon, Jan 18, 2016 at 10:11:23AM -0500, Mimi Zohar wrote: > > This patch replaces the module copy_module_from_fd() call with the VFS > > common kernel_read_file_from_fd() function. Instead of reading the > > kernel module twice, once for measuring/appraising and then loading > > the kernel module, the file is read once. > > > > This patch defines a new security hook named security_kernel_read_file(), > > which is called before reading the file. For now, call the module > > security hook from security_kernel_read_file until the LSMs have been > > converted to use the kernel_read_file hook. > > > > This patch retains the kernel_module_from_file hook, but removes the > > security_kernel_module_from_file() function. > > I think it would help if your cover letter and this patch described > a bit that some LSMs either prefer to read / check / appraise files > prior to loading and some other prefer to do that later. You could > explain the LSM hook preferences and what they do. Then here you > can explain how this one prefers a hook early, but acknowledge that > the other one still exists. Before this patch set, IMA measured/appraised/audited a file before allowing it to be accessed, causing the file in some cases to be read twice. This patch set changes that. Files are read into memory and then measured/appraised/audited. It's been a while since this hook was added. As I recall, Kees added the pre module hook to limit loading kernel modules to only those filesystems that were mounted read-only. I would have to look at each of the LSMs to see how they're using the hooks. > So: > > kernel_read_file() { > ... > security_kernel_read_file(); > ... > security_kernel_post_read_file(); > ... > } > > > diff --git a/include/linux/lsm_hooks.h b/include/linux/lsm_hooks.h > > index 4e6e2af..9915310 100644 > > --- a/include/linux/lsm_hooks.h > > +++ b/include/linux/lsm_hooks.h > > @@ -1465,6 +1471,7 @@ union security_list_options { > > int (*kernel_fw_from_file)(struct file *file, char *buf, size_t size); > > int (*kernel_module_request)(char *kmod_name); > > int (*kernel_module_from_file)(struct file *file); > > + int (*kernel_read_file)(struct file *file, int policy_id); > > int (*kernel_post_read_file)(struct file *file, char *buf, loff_t size, > > int policy_id); > > int (*task_fix_setuid)(struct cred *new, const struct cred *old, > > Is the goal to eventually kill the other LSM hooks and just keep the > file one? If so where is that done in this series? It was not clear. As mentioned in the cover letter, consolidating the LSM hooks is not covered in this patch set. I was under the impression that not only were we defining a common kernel read file function, but that we were also consolidating the pre and post security hooks as well. By defining the pre and post security hooks in this patch set, it permits each of the LSMs to migrate to the new hooks independently of each other. Lets ask the LSM maintainers what they think. Paul, Casey, Kees, Jon, Tetsuo does it make sense to consolidate the module, firmware, and kexec pre and post security hooks and have just one set of pre and post security kernel_read_file hook instead? Does it make sense for this patch set to define the new hooks to allow the LSMs to migrate to it independently of each other? Mimi