Re: [PATCH 2/4] ima: Simplify ima_eventsig_init()

["Serge E. Hallyn" <serge@hallyn.com>]

Quoting Thiago Jung Bauermann (bauerman@linux.vnet.ibm.com):
> 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 <bauerman@linux.vnet.ibm.com>

Acked-by: Serge Hallyn <serge@hallyn.com>

> ---
>  security/integrity/ima/ima_template_lib.c | 11 +++--------
>  1 file changed, 3 insertions(+), 8 deletions(-)
> 
> diff --git a/security/integrity/ima/ima_template_lib.c b/security/integrity/ima/ima_template_lib.c
> index 28af43f63572..5afaa53decc5 100644
> --- a/security/integrity/ima/ima_template_lib.c
> +++ b/security/integrity/ima/ima_template_lib.c
> @@ -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,
>  		      struct ima_field_data *field_data)
>  {
> -	enum data_formats fmt = DATA_FMT_HEX;
>  	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))
> -		goto out;
> +		return 0;
>  
> -	rc = ima_write_template_field_data(xattr_value, xattr_len, fmt,
> -					   field_data);
> -out:
> -	return rc;
> +	return ima_write_template_field_data(xattr_value, event_data->xattr_len,
> +					     DATA_FMT_HEX, field_data);
>  }