From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Cooper Subject: Re: [PATCH] Fix boot crash on xsm/flask enabled builds when no policy module is present Date: Mon, 26 Aug 2013 11:52:15 +0100 Message-ID: <521B335F.9020004@citrix.com> References: <1377511404-3365-1-git-send-email-tomasz.wroblewski@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VDuPB-0000bb-Vd for xen-devel@lists.xenproject.org; Mon, 26 Aug 2013 10:52:18 +0000 In-Reply-To: <1377511404-3365-1-git-send-email-tomasz.wroblewski@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Tomasz Wroblewski Cc: xen-devel@lists.xenproject.org, Daniel De Graaf List-Id: xen-devel@lists.xenproject.org On 26/08/2013 11:03, Tomasz Wroblewski wrote: > Xen crashes on boot of xsm/flask enabled builds, if policy module is not specified. > This seems to have worked on 4.1 at least. Can be fixed by testing whether policy_buffer > is NULL before attempting to load from it - it's a global which is set to non-NULL when > policy module is detected. > > Signed-off-by: Tomasz Wroblewski CCing Daniel De Graaf, as the maintainer of this code. However FWIW, Reviewed-by: Andrew Cooper > --- > xen/xsm/flask/hooks.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c > index fa0589a..cfa2929 100644 > --- a/xen/xsm/flask/hooks.c > +++ b/xen/xsm/flask/hooks.c > @@ -1585,7 +1585,8 @@ static __init int flask_init(void) > if ( register_xsm(&flask_ops) ) > panic("Flask: Unable to register with XSM.\n"); > > - ret = security_load_policy(policy_buffer, policy_size); > + if ( policy_buffer ) > + ret = security_load_policy(policy_buffer, policy_size); > > if ( flask_enforcing ) > printk("Flask: Starting in enforcing mode.\n");