mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-05 18:14:07 +08:00
5a0e3ad6af
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>
192 lines
5.6 KiB
C
192 lines
5.6 KiB
C
/*
|
|
* Copyright (C) 2008 IBM Corporation
|
|
*
|
|
* Author: Mimi Zohar <zohar@us.ibm.com>
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License as
|
|
* published by the Free Software Foundation, version 2 of the
|
|
* License.
|
|
*
|
|
* File: ima_api.c
|
|
* Implements must_measure, collect_measurement, store_measurement,
|
|
* and store_template.
|
|
*/
|
|
#include <linux/module.h>
|
|
#include <linux/slab.h>
|
|
|
|
#include "ima.h"
|
|
static const char *IMA_TEMPLATE_NAME = "ima";
|
|
|
|
/*
|
|
* ima_store_template - store ima template measurements
|
|
*
|
|
* Calculate the hash of a template entry, add the template entry
|
|
* to an ordered list of measurement entries maintained inside the kernel,
|
|
* and also update the aggregate integrity value (maintained inside the
|
|
* configured TPM PCR) over the hashes of the current list of measurement
|
|
* entries.
|
|
*
|
|
* Applications retrieve the current kernel-held measurement list through
|
|
* the securityfs entries in /sys/kernel/security/ima. The signed aggregate
|
|
* TPM PCR (called quote) can be retrieved using a TPM user space library
|
|
* and is used to validate the measurement list.
|
|
*
|
|
* Returns 0 on success, error code otherwise
|
|
*/
|
|
int ima_store_template(struct ima_template_entry *entry,
|
|
int violation, struct inode *inode)
|
|
{
|
|
const char *op = "add_template_measure";
|
|
const char *audit_cause = "hashing_error";
|
|
int result;
|
|
|
|
memset(entry->digest, 0, sizeof(entry->digest));
|
|
entry->template_name = IMA_TEMPLATE_NAME;
|
|
entry->template_len = sizeof(entry->template);
|
|
|
|
if (!violation) {
|
|
result = ima_calc_template_hash(entry->template_len,
|
|
&entry->template,
|
|
entry->digest);
|
|
if (result < 0) {
|
|
integrity_audit_msg(AUDIT_INTEGRITY_PCR, inode,
|
|
entry->template_name, op,
|
|
audit_cause, result, 0);
|
|
return result;
|
|
}
|
|
}
|
|
result = ima_add_template_entry(entry, violation, op, inode);
|
|
return result;
|
|
}
|
|
|
|
/*
|
|
* ima_add_violation - add violation to measurement list.
|
|
*
|
|
* Violations are flagged in the measurement list with zero hash values.
|
|
* By extending the PCR with 0xFF's instead of with zeroes, the PCR
|
|
* value is invalidated.
|
|
*/
|
|
void ima_add_violation(struct inode *inode, const unsigned char *filename,
|
|
const char *op, const char *cause)
|
|
{
|
|
struct ima_template_entry *entry;
|
|
int violation = 1;
|
|
int result;
|
|
|
|
/* can overflow, only indicator */
|
|
atomic_long_inc(&ima_htable.violations);
|
|
|
|
entry = kmalloc(sizeof(*entry), GFP_KERNEL);
|
|
if (!entry) {
|
|
result = -ENOMEM;
|
|
goto err_out;
|
|
}
|
|
memset(&entry->template, 0, sizeof(entry->template));
|
|
strncpy(entry->template.file_name, filename, IMA_EVENT_NAME_LEN_MAX);
|
|
result = ima_store_template(entry, violation, inode);
|
|
if (result < 0)
|
|
kfree(entry);
|
|
err_out:
|
|
integrity_audit_msg(AUDIT_INTEGRITY_PCR, inode, filename,
|
|
op, cause, result, 0);
|
|
}
|
|
|
|
/**
|
|
* ima_must_measure - measure decision based on policy.
|
|
* @inode: pointer to inode to measure
|
|
* @mask: contains the permission mask (MAY_READ, MAY_WRITE, MAY_EXECUTE)
|
|
* @function: calling function (FILE_CHECK, BPRM_CHECK, FILE_MMAP)
|
|
*
|
|
* The policy is defined in terms of keypairs:
|
|
* subj=, obj=, type=, func=, mask=, fsmagic=
|
|
* subj,obj, and type: are LSM specific.
|
|
* func: FILE_CHECK | BPRM_CHECK | FILE_MMAP
|
|
* mask: contains the permission mask
|
|
* fsmagic: hex value
|
|
*
|
|
* Must be called with iint->mutex held.
|
|
*
|
|
* Return 0 to measure. Return 1 if already measured.
|
|
* For matching a DONT_MEASURE policy, no policy, or other
|
|
* error, return an error code.
|
|
*/
|
|
int ima_must_measure(struct ima_iint_cache *iint, struct inode *inode,
|
|
int mask, int function)
|
|
{
|
|
int must_measure;
|
|
|
|
if (iint->flags & IMA_MEASURED)
|
|
return 1;
|
|
|
|
must_measure = ima_match_policy(inode, function, mask);
|
|
return must_measure ? 0 : -EACCES;
|
|
}
|
|
|
|
/*
|
|
* ima_collect_measurement - collect file measurement
|
|
*
|
|
* Calculate the file hash, if it doesn't already exist,
|
|
* storing the measurement and i_version in the iint.
|
|
*
|
|
* Must be called with iint->mutex held.
|
|
*
|
|
* Return 0 on success, error code otherwise
|
|
*/
|
|
int ima_collect_measurement(struct ima_iint_cache *iint, struct file *file)
|
|
{
|
|
int result = -EEXIST;
|
|
|
|
if (!(iint->flags & IMA_MEASURED)) {
|
|
u64 i_version = file->f_dentry->d_inode->i_version;
|
|
|
|
memset(iint->digest, 0, IMA_DIGEST_SIZE);
|
|
result = ima_calc_hash(file, iint->digest);
|
|
if (!result)
|
|
iint->version = i_version;
|
|
}
|
|
return result;
|
|
}
|
|
|
|
/*
|
|
* ima_store_measurement - store file measurement
|
|
*
|
|
* Create an "ima" template and then store the template by calling
|
|
* ima_store_template.
|
|
*
|
|
* We only get here if the inode has not already been measured,
|
|
* but the measurement could already exist:
|
|
* - multiple copies of the same file on either the same or
|
|
* different filesystems.
|
|
* - the inode was previously flushed as well as the iint info,
|
|
* containing the hashing info.
|
|
*
|
|
* Must be called with iint->mutex held.
|
|
*/
|
|
void ima_store_measurement(struct ima_iint_cache *iint, struct file *file,
|
|
const unsigned char *filename)
|
|
{
|
|
const char *op = "add_template_measure";
|
|
const char *audit_cause = "ENOMEM";
|
|
int result = -ENOMEM;
|
|
struct inode *inode = file->f_dentry->d_inode;
|
|
struct ima_template_entry *entry;
|
|
int violation = 0;
|
|
|
|
entry = kmalloc(sizeof(*entry), GFP_KERNEL);
|
|
if (!entry) {
|
|
integrity_audit_msg(AUDIT_INTEGRITY_PCR, inode, filename,
|
|
op, audit_cause, result, 0);
|
|
return;
|
|
}
|
|
memset(&entry->template, 0, sizeof(entry->template));
|
|
memcpy(entry->template.digest, iint->digest, IMA_DIGEST_SIZE);
|
|
strncpy(entry->template.file_name, filename, IMA_EVENT_NAME_LEN_MAX);
|
|
|
|
result = ima_store_template(entry, violation, inode);
|
|
if (!result)
|
|
iint->flags |= IMA_MEASURED;
|
|
else
|
|
kfree(entry);
|
|
}
|