* [PATCH v2] xsm/flask: misra rule 8.4 fix
@ 2022-12-07 23:24 Stefano Stabellini
2022-12-08 8:31 ` Jan Beulich
2022-12-08 14:37 ` Daniel P. Smith
0 siblings, 2 replies; 3+ messages in thread
From: Stefano Stabellini @ 2022-12-07 23:24 UTC (permalink / raw)
To: xen-devel; +Cc: sstabellini, dpsmith, jbeulich, michal.orzel
Fix several MISRA Issues Rule 8.4 ("A compatible declaration shall be
visible when an object or function with external linkage is defined")
found by cppcheck affecting xen/xsm/flask.
- policydb_loaded_version is not declared; removed it because it is
unused
- move ss_initialized declaration to xen/xsm/flask/include/conditional.h
- #include <conditional.h> (which is
xen/xsm/flask/include/conditional.h) in xen/xsm/flask/ss/policydb.c so
that policydb.c also gets the declaration of ss_initialized
- #include <conditional.h> in xen/xsm/flask/ss/services.c to declare
security_*_bools functions that services.c is defining and using
This patch solves all the Rule 8.4 violations found by cppcheck on xsm/
Signed-off-by: Stefano Stabellini <stefano.stabellini@amd.com>
diff --git a/xen/xsm/flask/flask_op.c b/xen/xsm/flask/flask_op.c
index d319466c6b..b866e8d05f 100644
--- a/xen/xsm/flask/flask_op.c
+++ b/xen/xsm/flask/flask_op.c
@@ -56,8 +56,6 @@ static int bool_num = 0;
static int *bool_pending_values = NULL;
static int flask_security_make_bools(void);
-extern int ss_initialized;
-
static int __init cf_check parse_flask_param(const char *s)
{
if ( !strcmp(s, "enforcing") )
diff --git a/xen/xsm/flask/include/conditional.h b/xen/xsm/flask/include/conditional.h
index 90553405b0..879d40e147 100644
--- a/xen/xsm/flask/include/conditional.h
+++ b/xen/xsm/flask/include/conditional.h
@@ -24,4 +24,6 @@ int security_find_bool(const char *name);
char *security_get_bool_name(unsigned int b);
int security_get_bool_value(unsigned int b);
+extern int ss_initialized;
+
#endif
diff --git a/xen/xsm/flask/ss/policydb.c b/xen/xsm/flask/ss/policydb.c
index 162470bbbd..7f232f92fa 100644
--- a/xen/xsm/flask/ss/policydb.c
+++ b/xen/xsm/flask/ss/policydb.c
@@ -28,6 +28,7 @@
#include <xen/xmalloc.h>
#include <xen/string.h>
#include <xen/errno.h>
+#include <conditional.h>
#include "security.h"
#include "policydb.h"
@@ -1730,8 +1731,6 @@ static int policydb_bounds_sanity_check(struct policydb *p)
return 0;
}
-extern int ss_initialized;
-
/*
* Read the configuration data from a policy database binary
* representation file into a policy database structure.
diff --git a/xen/xsm/flask/ss/services.c b/xen/xsm/flask/ss/services.c
index dab07b5f60..35ad1034ca 100644
--- a/xen/xsm/flask/ss/services.c
+++ b/xen/xsm/flask/ss/services.c
@@ -42,6 +42,7 @@
#include <xen/spinlock.h>
#include <xen/rwlock.h>
#include <xen/errno.h>
+#include <conditional.h>
#include "flask.h"
#include "avc.h"
#include "avc_ss.h"
@@ -53,8 +54,6 @@
#include "conditional.h"
#include "mls.h"
-unsigned int policydb_loaded_version;
-
static DEFINE_RWLOCK(policy_rwlock);
#define POLICY_RDLOCK read_lock(&policy_rwlock)
#define POLICY_WRLOCK write_lock(&policy_rwlock)
@@ -1388,7 +1387,6 @@ int security_load_policy(const void *data, size_t len)
policydb_destroy(&policydb);
return -EINVAL;
}
- policydb_loaded_version = policydb.policyvers;
ss_initialized = 1;
seqno = ++latest_granting;
LOAD_UNLOCK;
@@ -1447,7 +1445,6 @@ int security_load_policy(const void *data, size_t len)
memcpy(&policydb, &newpolicydb, sizeof policydb);
sidtab_set(&sidtab, &newsidtab);
seqno = ++latest_granting;
- policydb_loaded_version = policydb.policyvers;
POLICY_WRUNLOCK;
LOAD_UNLOCK;
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v2] xsm/flask: misra rule 8.4 fix
2022-12-07 23:24 [PATCH v2] xsm/flask: misra rule 8.4 fix Stefano Stabellini
@ 2022-12-08 8:31 ` Jan Beulich
2022-12-08 14:37 ` Daniel P. Smith
1 sibling, 0 replies; 3+ messages in thread
From: Jan Beulich @ 2022-12-08 8:31 UTC (permalink / raw)
To: Stefano Stabellini; +Cc: dpsmith, michal.orzel, xen-devel
On 08.12.2022 00:24, Stefano Stabellini wrote:
> Fix several MISRA Issues Rule 8.4 ("A compatible declaration shall be
> visible when an object or function with external linkage is defined")
> found by cppcheck affecting xen/xsm/flask.
>
> - policydb_loaded_version is not declared; removed it because it is
> unused
> - move ss_initialized declaration to xen/xsm/flask/include/conditional.h
> - #include <conditional.h> (which is
> xen/xsm/flask/include/conditional.h) in xen/xsm/flask/ss/policydb.c so
> that policydb.c also gets the declaration of ss_initialized
> - #include <conditional.h> in xen/xsm/flask/ss/services.c to declare
> security_*_bools functions that services.c is defining and using
>
> This patch solves all the Rule 8.4 violations found by cppcheck on xsm/
>
> Signed-off-by: Stefano Stabellini <stefano.stabellini@amd.com>
Reviewed-by: Jan Beulich <jbeulich@suse.com>
But I'll continue the v1 thread wrt the two conditional.h; that's
independent of the changes done here, though.
Jan
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v2] xsm/flask: misra rule 8.4 fix
2022-12-07 23:24 [PATCH v2] xsm/flask: misra rule 8.4 fix Stefano Stabellini
2022-12-08 8:31 ` Jan Beulich
@ 2022-12-08 14:37 ` Daniel P. Smith
1 sibling, 0 replies; 3+ messages in thread
From: Daniel P. Smith @ 2022-12-08 14:37 UTC (permalink / raw)
To: Stefano Stabellini, xen-devel; +Cc: jbeulich, michal.orzel
On 12/7/22 18:24, Stefano Stabellini wrote:
> Fix several MISRA Issues Rule 8.4 ("A compatible declaration shall be
> visible when an object or function with external linkage is defined")
> found by cppcheck affecting xen/xsm/flask.
>
> - policydb_loaded_version is not declared; removed it because it is
> unused
> - move ss_initialized declaration to xen/xsm/flask/include/conditional.h
> - #include <conditional.h> (which is
> xen/xsm/flask/include/conditional.h) in xen/xsm/flask/ss/policydb.c so
> that policydb.c also gets the declaration of ss_initialized
> - #include <conditional.h> in xen/xsm/flask/ss/services.c to declare
> security_*_bools functions that services.c is defining and using
>
> This patch solves all the Rule 8.4 violations found by cppcheck on xsm/
>
> Signed-off-by: Stefano Stabellini <stefano.stabellini@amd.com>
>
Ack-by: Daniel P. Smith <dpsmith@apertussolutions.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-12-08 14:38 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-12-07 23:24 [PATCH v2] xsm/flask: misra rule 8.4 fix Stefano Stabellini
2022-12-08 8:31 ` Jan Beulich
2022-12-08 14:37 ` Daniel P. Smith
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.