Skip to content

Commit 1775cb8

Browse files
bauermannMimi Zohar
authored andcommitted
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: Thiago Jung Bauermann <[email protected]> Acked-by: Serge Hallyn <[email protected]> Signed-off-by: Mimi Zohar <[email protected]>
1 parent 11c60f2 commit 1775cb8

File tree

1 file changed

+3
-8
lines changed

1 file changed

+3
-8
lines changed

security/integrity/ima/ima_template_lib.c

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -378,16 +378,11 @@ int ima_eventname_ng_init(struct ima_event_data *event_data,
378378
int ima_eventsig_init(struct ima_event_data *event_data,
379379
struct ima_field_data *field_data)
380380
{
381-
enum data_formats fmt = DATA_FMT_HEX;
382381
struct evm_ima_xattr_data *xattr_value = event_data->xattr_value;
383-
int xattr_len = event_data->xattr_len;
384-
int rc = 0;
385382

386383
if ((!xattr_value) || (xattr_value->type != EVM_IMA_XATTR_DIGSIG))
387-
goto out;
384+
return 0;
388385

389-
rc = ima_write_template_field_data(xattr_value, xattr_len, fmt,
390-
field_data);
391-
out:
392-
return rc;
386+
return ima_write_template_field_data(xattr_value, event_data->xattr_len,
387+
DATA_FMT_HEX, field_data);
393388
}

0 commit comments

Comments
 (0)