Hi Daniel,
> -----Original Message-----
> Subject: [PATCH] xsm/flask: adjust print messages to use %pd
>
> Print messages from flask use an inconsistent format when printing the
> domain
> id. The %pd conversion specifier provides a consistent way to format for the
> domain id and aligns with the rest of the hypervisor code.
>
> Signed-off-by: Daniel P. Smith <dpsm...@apertussolutions.com>
> ---
> xen/xsm/flask/avc.c | 8 ++++----
> xen/xsm/flask/hooks.c | 3 +--
> 2 files changed, 5 insertions(+), 6 deletions(-)
>
> diff --git a/xen/xsm/flask/avc.c b/xen/xsm/flask/avc.c
> index 4a75ec97e2..4a86681c81 100644
> --- a/xen/xsm/flask/avc.c
> +++ b/xen/xsm/flask/avc.c
> @@ -566,14 +566,14 @@ void avc_audit(u32 ssid, u32 tsid, u16 tclass, u32
> requested,
> if ( a && (a->sdom || a->tdom) )
> {
> if ( a->sdom && a->tdom && a->sdom != a->tdom )
> - avc_printk(&buf, "domid=%d target=%d ", a->sdom->domain_id, a-
> >tdom->domain_id);
> + avc_printk(&buf, "source=%pd target=%dp ", a->sdom, a->tdom);
I guess this should be target=%pd?
With this fixed:
Reviewed-by: Henry Wang <henry.w...@arm.com>
This should also be fine to merge in 4.17, but following the discussion with
Julien and Jan I think providing a Release ack would lead to confusion...
Kind regards,
Henry
> else if ( a->sdom )
> - avc_printk(&buf, "domid=%d ", a->sdom->domain_id);
> + avc_printk(&buf, "source=%pd ", a->sdom);
> else
> - avc_printk(&buf, "target=%d ", a->tdom->domain_id);
> + avc_printk(&buf, "target=%pd ", a->tdom);
> }
> else if ( cdom )
> - avc_printk(&buf, "domid=%d ", cdom->domain_id);
> + avc_printk(&buf, "current=%pd ", cdom);
> switch ( a ? a->type : 0 ) {
> case AVC_AUDIT_DATA_DEV:
> avc_printk(&buf, "device=%#lx ", a->device);
> diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c
> index 8bd56644ef..a79281bdb0 100644
> --- a/xen/xsm/flask/hooks.c
> +++ b/xen/xsm/flask/hooks.c
> @@ -281,8 +281,7 @@ static int cf_check flask_evtchn_interdomain(
> rc = security_transition_sid(sid1, sid2, SECCLASS_EVENT, &newsid);
> if ( rc )
> {
> - printk("security_transition_sid failed, rc=%d, Dom%d\n",
> - -rc, d2->domain_id);
> + printk("security_transition_sid failed, rc=%d, %pd\n", -rc, d2);
> return rc;
> }
>
> --
> 2.20.1
>
