提交 1775cb87 编写于 作者: T Thiago Jung Bauermann 提交者: Mimi Zohar

ima: Simplify ima_eventsig_init()

The "goto out" statement doesn't have any purpose since there's no cleanup
to be done when returning early, so remove it. This also makes the rc
variable unnecessary so remove it as well.

Also, the xattr_len and fmt variables are redundant so remove them as well.
Signed-off-by: NThiago Jung Bauermann <bauerman@linux.vnet.ibm.com>
Acked-by: NSerge Hallyn <serge@hallyn.com>
Signed-off-by: NMimi Zohar <zohar@linux.vnet.ibm.com>
上级 11c60f23
...@@ -378,16 +378,11 @@ int ima_eventname_ng_init(struct ima_event_data *event_data, ...@@ -378,16 +378,11 @@ int ima_eventname_ng_init(struct ima_event_data *event_data,
int ima_eventsig_init(struct ima_event_data *event_data, int ima_eventsig_init(struct ima_event_data *event_data,
struct ima_field_data *field_data) struct ima_field_data *field_data)
{ {
enum data_formats fmt = DATA_FMT_HEX;
struct evm_ima_xattr_data *xattr_value = event_data->xattr_value; struct evm_ima_xattr_data *xattr_value = event_data->xattr_value;
int xattr_len = event_data->xattr_len;
int rc = 0;
if ((!xattr_value) || (xattr_value->type != EVM_IMA_XATTR_DIGSIG)) if ((!xattr_value) || (xattr_value->type != EVM_IMA_XATTR_DIGSIG))
goto out; return 0;
rc = ima_write_template_field_data(xattr_value, xattr_len, fmt, return ima_write_template_field_data(xattr_value, event_data->xattr_len,
field_data); DATA_FMT_HEX, field_data);
out:
return rc;
} }
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册