diff options
| author | Dmitry Kasatkin <d.kasatkin@samsung.com> | 2014-09-03 10:19:57 +0300 |
|---|---|---|
| committer | Mimi Zohar <zohar@linux.vnet.ibm.com> | 2014-09-09 10:28:48 -0400 |
| commit | 3a8a2eadc4946ce3af39b3447c32532324538f75 (patch) | |
| tree | 59000b738dee69aba5b19ac1531dbb88e4ddcba1 | |
| parent | f68c05f4d2d4e19c40f4ac1e769cc0a2f9f544a0 (diff) | |
| download | linux-3a8a2eadc4946ce3af39b3447c32532324538f75.tar.gz linux-3a8a2eadc4946ce3af39b3447c32532324538f75.tar.bz2 linux-3a8a2eadc4946ce3af39b3447c32532324538f75.zip | |
ima: remove unnecessary extra variable
'function' variable value can be changed instead of
allocating extra '_func' variable.
Signed-off-by: Dmitry Kasatkin <d.kasatkin@samsung.com>
Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
| -rw-r--r-- | security/integrity/ima/ima_main.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/security/integrity/ima/ima_main.c b/security/integrity/ima/ima_main.c index f7b85bf0eaf3..aaf5552e808d 100644 --- a/security/integrity/ima/ima_main.c +++ b/security/integrity/ima/ima_main.c @@ -164,7 +164,7 @@ static int process_measurement(struct file *file, const char *filename, struct ima_template_desc *template_desc; char *pathbuf = NULL; const char *pathname = NULL; - int rc = -ENOMEM, action, must_appraise, _func; + int rc = -ENOMEM, action, must_appraise; struct evm_ima_xattr_data *xattr_value = NULL, **xattr_ptr = NULL; int xattr_len = 0; @@ -182,7 +182,8 @@ static int process_measurement(struct file *file, const char *filename, must_appraise = action & IMA_APPRAISE; /* Is the appraise rule hook specific? */ - _func = (action & IMA_FILE_APPRAISE) ? FILE_CHECK : function; + if (action & IMA_FILE_APPRAISE) + function = FILE_CHECK; mutex_lock(&inode->i_mutex); @@ -201,7 +202,7 @@ static int process_measurement(struct file *file, const char *filename, /* Nothing to do, just return existing appraised status */ if (!action) { if (must_appraise) - rc = ima_get_cache_status(iint, _func); + rc = ima_get_cache_status(iint, function); goto out_digsig; } @@ -223,7 +224,7 @@ static int process_measurement(struct file *file, const char *filename, ima_store_measurement(iint, file, pathname, xattr_value, xattr_len); if (action & IMA_APPRAISE_SUBMASK) - rc = ima_appraise_measurement(_func, iint, file, pathname, + rc = ima_appraise_measurement(function, iint, file, pathname, xattr_value, xattr_len, opened); if (action & IMA_AUDIT) ima_audit_measurement(iint, pathname); |