| Message ID | 1465483638-9489-9-git-send-email-dgdegra@tycho.nsa.gov (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
>>> On 09.06.16 at 16:47, <dgdegra@tycho.nsa.gov> wrote: > --- a/xen/xsm/flask/ss/policydb.h > +++ b/xen/xsm/flask/ss/policydb.h > @@ -158,8 +158,8 @@ struct ocontext { > u64 high_iomem; > } iomem; > } u; > - struct context context[2]; /* security context(s) */ > - u32 sid[2]; /* SID(s) */ > + struct context context[1]; /* security context(s) */ > + u32 sid[1]; /* SID(s) */ Is keeping them be arrays useful for anything? Jan
On 06/09/2016 12:01 PM, Jan Beulich wrote: >>>> On 09.06.16 at 16:47, <dgdegra@tycho.nsa.gov> wrote: >> --- a/xen/xsm/flask/ss/policydb.h >> +++ b/xen/xsm/flask/ss/policydb.h >> @@ -158,8 +158,8 @@ struct ocontext { >> u64 high_iomem; >> } iomem; >> } u; >> - struct context context[2]; /* security context(s) */ >> - u32 sid[2]; /* SID(s) */ >> + struct context context[1]; /* security context(s) */ >> + u32 sid[1]; /* SID(s) */ > > Is keeping them be arrays useful for anything? > > Jan > > No, it was just more code churn to convert them to fields.
diff --git a/xen/xsm/flask/ss/policydb.c b/xen/xsm/flask/ss/policydb.c index eebfe9c..8aa88c1 100644 --- a/xen/xsm/flask/ss/policydb.c +++ b/xen/xsm/flask/ss/policydb.c @@ -639,7 +639,6 @@ static int (*destroy_f[SYM_NUM]) (void *key, void *datum, void *datap) = static void ocontext_destroy(struct ocontext *c, int i) { context_destroy(&c->context[0]); - context_destroy(&c->context[1]); if ( i == OCON_ISID || i == OCON_DTREE ) xfree(c->u.name); xfree(c); diff --git a/xen/xsm/flask/ss/policydb.h b/xen/xsm/flask/ss/policydb.h index 30be71a..50e22f3 100644 --- a/xen/xsm/flask/ss/policydb.h +++ b/xen/xsm/flask/ss/policydb.h @@ -158,8 +158,8 @@ struct ocontext { u64 high_iomem; } iomem; } u; - struct context context[2]; /* security context(s) */ - u32 sid[2]; /* SID(s) */ + struct context context[1]; /* security context(s) */ + u32 sid[1]; /* SID(s) */ struct ocontext *next; };
This field was originally used in Linux for a default message code for network interfaces. It has never been used in Xen, so remove it. Signed-off-by: Daniel De Graaf <dgdegra@tycho.nsa.gov> --- xen/xsm/flask/ss/policydb.c | 1 - xen/xsm/flask/ss/policydb.h | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-)