2021-06-08 23:12:12

by Austin Kim

Subject: [PATCH] LSM: SafeSetID: Mark safesetid_initialized as __initdata

Mark safesetid_initialized as __initdata since it is only used
in initialization routine.

Signed-off-by: Austin Kim <[email protected]>
---
security/safesetid/lsm.c | 2 +-
security/safesetid/lsm.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/security/safesetid/lsm.c b/security/safesetid/lsm.c
index 1079c6d54784..963f4ad9cb66 100644
--- a/security/safesetid/lsm.c
+++ b/security/safesetid/lsm.c
@@ -22,7 +22,7 @@
#include "lsm.h"

/* Flag indicating whether initialization completed */
-int safesetid_initialized;
+int safesetid_initialized __initdata;

struct setid_ruleset __rcu *safesetid_setuid_rules;
struct setid_ruleset __rcu *safesetid_setgid_rules;
diff --git a/security/safesetid/lsm.h b/security/safesetid/lsm.h
index bde8c43a3767..d346f4849cea 100644
--- a/security/safesetid/lsm.h
+++ b/security/safesetid/lsm.h
@@ -19,7 +19,7 @@
#include <linux/hashtable.h>

/* Flag indicating whether initialization completed */
-extern int safesetid_initialized;
+extern int safesetid_initialized __initdata;

enum sid_policy_type {
SIDPOL_DEFAULT, /* source ID is unaffected by policy */
--
2.20.1

2021-06-10 16:53:57

by Micah Morton

Subject: Re: [PATCH] LSM: SafeSetID: Mark safesetid_initialized as __initdata

Thanks for the patch. Looks right, since that variable is only used in
safesetid_security_init() and safesetid_init_securityfs(), which are
both marked __init. I can merge it to the safesetid-next branch today
and send the patch through my tree during the 5.14 merge window.

On Tue, Jun 8, 2021 at 1:09 PM Austin Kim <[email protected]> wrote:
>
> Mark safesetid_initialized as __initdata since it is only used
> in initialization routine.
>
> Signed-off-by: Austin Kim <[email protected]>
> ---
> security/safesetid/lsm.c | 2 +-
> security/safesetid/lsm.h | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/security/safesetid/lsm.c b/security/safesetid/lsm.c
> index 1079c6d54784..963f4ad9cb66 100644
> --- a/security/safesetid/lsm.c
> +++ b/security/safesetid/lsm.c
> @@ -22,7 +22,7 @@
> #include "lsm.h"
>
> /* Flag indicating whether initialization completed */
> -int safesetid_initialized;
> +int safesetid_initialized __initdata;
>
> struct setid_ruleset __rcu *safesetid_setuid_rules;
> struct setid_ruleset __rcu *safesetid_setgid_rules;
> diff --git a/security/safesetid/lsm.h b/security/safesetid/lsm.h
> index bde8c43a3767..d346f4849cea 100644
> --- a/security/safesetid/lsm.h
> +++ b/security/safesetid/lsm.h
> @@ -19,7 +19,7 @@
> #include <linux/hashtable.h>
>
> /* Flag indicating whether initialization completed */
> -extern int safesetid_initialized;
> +extern int safesetid_initialized __initdata;
>
> enum sid_policy_type {
> SIDPOL_DEFAULT, /* source ID is unaffected by policy */
> --
> 2.20.1
>

2021-06-10 22:36:59

by Austin Kim

Subject: Re: [PATCH] LSM: SafeSetID: Mark safesetid_initialized as __initdata

2021년 6월 11일 (금) 오전 1:50, Micah Morton <[email protected]>님이 작성:
>
> Thanks for the patch. Looks right, since that variable is only used in
> safesetid_security_init() and safesetid_init_securityfs(), which are
> both marked __init. I can merge it to the safesetid-next branch today
> and send the patch through my tree during the 5.14 merge window.

Great. Thanks!

>
> On Tue, Jun 8, 2021 at 1:09 PM Austin Kim <[email protected]> wrote:
> >
> > Mark safesetid_initialized as __initdata since it is only used
> > in initialization routine.
> >
> > Signed-off-by: Austin Kim <[email protected]>
> > ---
> > security/safesetid/lsm.c | 2 +-
> > security/safesetid/lsm.h | 2 +-
> > 2 files changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/security/safesetid/lsm.c b/security/safesetid/lsm.c
> > index 1079c6d54784..963f4ad9cb66 100644
> > --- a/security/safesetid/lsm.c
> > +++ b/security/safesetid/lsm.c
> > @@ -22,7 +22,7 @@
> > #include "lsm.h"
> >
> > /* Flag indicating whether initialization completed */
> > -int safesetid_initialized;
> > +int safesetid_initialized __initdata;
> >
> > struct setid_ruleset __rcu *safesetid_setuid_rules;
> > struct setid_ruleset __rcu *safesetid_setgid_rules;
> > diff --git a/security/safesetid/lsm.h b/security/safesetid/lsm.h
> > index bde8c43a3767..d346f4849cea 100644
> > --- a/security/safesetid/lsm.h
> > +++ b/security/safesetid/lsm.h
> > @@ -19,7 +19,7 @@
> > #include <linux/hashtable.h>
> >
> > /* Flag indicating whether initialization completed */
> > -extern int safesetid_initialized;
> > +extern int safesetid_initialized __initdata;
> >
> > enum sid_policy_type {
> > SIDPOL_DEFAULT, /* source ID is unaffected by policy */
> > --
> > 2.20.1
> >