Commit 3a8a2ead authored by Dmitry Kasatkin's avatar Dmitry Kasatkin Committed by Mimi Zohar

ima: remove unnecessary extra variable

'function' variable value can be changed instead of
allocating extra '_func' variable.
Signed-off-by: default avatarDmitry Kasatkin <d.kasatkin@samsung.com>
Signed-off-by: default avatarMimi Zohar <zohar@linux.vnet.ibm.com>
parent f68c05f4
...@@ -164,7 +164,7 @@ static int process_measurement(struct file *file, const char *filename, ...@@ -164,7 +164,7 @@ static int process_measurement(struct file *file, const char *filename,
struct ima_template_desc *template_desc; struct ima_template_desc *template_desc;
char *pathbuf = NULL; char *pathbuf = NULL;
const char *pathname = 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; struct evm_ima_xattr_data *xattr_value = NULL, **xattr_ptr = NULL;
int xattr_len = 0; int xattr_len = 0;
...@@ -182,7 +182,8 @@ static int process_measurement(struct file *file, const char *filename, ...@@ -182,7 +182,8 @@ static int process_measurement(struct file *file, const char *filename,
must_appraise = action & IMA_APPRAISE; must_appraise = action & IMA_APPRAISE;
/* Is the appraise rule hook specific? */ /* 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); mutex_lock(&inode->i_mutex);
...@@ -201,7 +202,7 @@ static int process_measurement(struct file *file, const char *filename, ...@@ -201,7 +202,7 @@ static int process_measurement(struct file *file, const char *filename,
/* Nothing to do, just return existing appraised status */ /* Nothing to do, just return existing appraised status */
if (!action) { if (!action) {
if (must_appraise) if (must_appraise)
rc = ima_get_cache_status(iint, _func); rc = ima_get_cache_status(iint, function);
goto out_digsig; goto out_digsig;
} }
...@@ -223,7 +224,7 @@ static int process_measurement(struct file *file, const char *filename, ...@@ -223,7 +224,7 @@ static int process_measurement(struct file *file, const char *filename,
ima_store_measurement(iint, file, pathname, ima_store_measurement(iint, file, pathname,
xattr_value, xattr_len); xattr_value, xattr_len);
if (action & IMA_APPRAISE_SUBMASK) 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); xattr_value, xattr_len, opened);
if (action & IMA_AUDIT) if (action & IMA_AUDIT)
ima_audit_measurement(iint, pathname); ima_audit_measurement(iint, pathname);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment