diff mbox series

[Xenial,SRU] UBUNTU: SAUCE: apparmor: fix bad __initdata tagging on, apparmor_initialized

Message ID 69f14e73-3c49-7498-8c48-d6b1ae052572@canonical.com
State New
Headers show
Series [Xenial,SRU] UBUNTU: SAUCE: apparmor: fix bad __initdata tagging on, apparmor_initialized | expand

Commit Message

John Johansen March 13, 2018, 8:48 p.m. UTC
apparmor_initialized is no longer init only data and the __initdata
tagging was removed from the variable definition in
security/apparmor/lsm.c but missed being removed from the declaration
in security/apparmor/include/lib.h

resulting in the following build warning

WARNING: vmlinux.o(.text+0x393a60): Section mismatch in reference from the function param_set_aauint() to the variable .init.data:apparmor_initialized

Signed-off-by: John Johansen <john.johansen@canonical.com>
---
 security/apparmor/include/lib.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Stefan Bader March 20, 2018, 1:13 p.m. UTC | #1
On 13.03.2018 21:48, John Johansen wrote:
> apparmor_initialized is no longer init only data and the __initdata
> tagging was removed from the variable definition in
> security/apparmor/lsm.c but missed being removed from the declaration
> in security/apparmor/include/lib.h
> 
> resulting in the following build warning
> 
> WARNING: vmlinux.o(.text+0x393a60): Section mismatch in reference from the function param_set_aauint() to the variable .init.data:apparmor_initialized

LP Bug reference?

-Stefan

> 
> Signed-off-by: John Johansen <john.johansen@canonical.com>
> ---
>  security/apparmor/include/lib.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/security/apparmor/include/lib.h b/security/apparmor/include/lib.h
> index 954e22ae8342..3f3b8d09f1c5 100644
> --- a/security/apparmor/include/lib.h
> +++ b/security/apparmor/include/lib.h
> @@ -56,7 +56,7 @@
>  	} while (0)
>  
>  /* Flag indicating whether initialization completed */
> -extern int apparmor_initialized __initdata;
> +extern int apparmor_initialized;
>  
>  /* fn's in lib */
>  char *aa_split_fqname(char *args, char **ns_name);
>
John Johansen March 24, 2018, 12:59 a.m. UTC | #2
On 03/20/2018 06:13 AM, Stefan Bader wrote:
> On 13.03.2018 21:48, John Johansen wrote:
>> apparmor_initialized is no longer init only data and the __initdata
>> tagging was removed from the variable definition in
>> security/apparmor/lsm.c but missed being removed from the declaration
>> in security/apparmor/include/lib.h
>>
>> resulting in the following build warning
>>
>> WARNING: vmlinux.o(.text+0x393a60): Section mismatch in reference from the function param_set_aauint() to the variable .init.data:apparmor_initialized
> 
> LP Bug reference?

oops sorry
BugLink: http://bugs.launchpad.net/bugs/1758471

> 
> -Stefan
> 
>>
>> Signed-off-by: John Johansen <john.johansen@canonical.com>
>> ---
>>  security/apparmor/include/lib.h | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/security/apparmor/include/lib.h b/security/apparmor/include/lib.h
>> index 954e22ae8342..3f3b8d09f1c5 100644
>> --- a/security/apparmor/include/lib.h
>> +++ b/security/apparmor/include/lib.h
>> @@ -56,7 +56,7 @@
>>  	} while (0)
>>  
>>  /* Flag indicating whether initialization completed */
>> -extern int apparmor_initialized __initdata;
>> +extern int apparmor_initialized;
>>  
>>  /* fn's in lib */
>>  char *aa_split_fqname(char *args, char **ns_name);
>>
> 
>
Stefan Bader March 28, 2018, 9:23 a.m. UTC | #3
On 13.03.2018 21:48, John Johansen wrote:
> apparmor_initialized is no longer init only data and the __initdata
> tagging was removed from the variable definition in
> security/apparmor/lsm.c but missed being removed from the declaration
> in security/apparmor/include/lib.h
> 
> resulting in the following build warning
> 
> WARNING: vmlinux.o(.text+0x393a60): Section mismatch in reference from the function param_set_aauint() to the variable .init.data:apparmor_initialized
> 
BugLink: http://bugs.launchpad.net/bugs/1758471

> Signed-off-by: John Johansen <john.johansen@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>

> ---

Note to fix/add BugLink upon commit

>  security/apparmor/include/lib.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/security/apparmor/include/lib.h b/security/apparmor/include/lib.h
> index 954e22ae8342..3f3b8d09f1c5 100644
> --- a/security/apparmor/include/lib.h
> +++ b/security/apparmor/include/lib.h
> @@ -56,7 +56,7 @@
>  	} while (0)
>  
>  /* Flag indicating whether initialization completed */
> -extern int apparmor_initialized __initdata;
> +extern int apparmor_initialized;
>  
>  /* fn's in lib */
>  char *aa_split_fqname(char *args, char **ns_name);
>
Kleber Sacilotto de Souza April 3, 2018, 12:51 p.m. UTC | #4
On 03/13/18 21:48, John Johansen wrote:
> apparmor_initialized is no longer init only data and the __initdata
> tagging was removed from the variable definition in
> security/apparmor/lsm.c but missed being removed from the declaration
> in security/apparmor/include/lib.h
> 
> resulting in the following build warning
> 
> WARNING: vmlinux.o(.text+0x393a60): Section mismatch in reference from the function param_set_aauint() to the variable .init.data:apparmor_initialized
> 
> Signed-off-by: John Johansen <john.johansen@canonical.com>
> ---
>  security/apparmor/include/lib.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/security/apparmor/include/lib.h b/security/apparmor/include/lib.h
> index 954e22ae8342..3f3b8d09f1c5 100644
> --- a/security/apparmor/include/lib.h
> +++ b/security/apparmor/include/lib.h
> @@ -56,7 +56,7 @@
>  	} while (0)
>  
>  /* Flag indicating whether initialization completed */
> -extern int apparmor_initialized __initdata;
> +extern int apparmor_initialized;
>  
>  /* fn's in lib */
>  char *aa_split_fqname(char *args, char **ns_name);
> 

Given the BugLink reference is added when applying the patch:

Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
Kleber Sacilotto de Souza April 3, 2018, 4:05 p.m. UTC | #5
On 03/13/18 21:48, John Johansen wrote:
> apparmor_initialized is no longer init only data and the __initdata
> tagging was removed from the variable definition in
> security/apparmor/lsm.c but missed being removed from the declaration
> in security/apparmor/include/lib.h
> 
> resulting in the following build warning
> 
> WARNING: vmlinux.o(.text+0x393a60): Section mismatch in reference from the function param_set_aauint() to the variable .init.data:apparmor_initialized
> 
> Signed-off-by: John Johansen <john.johansen@canonical.com>
> ---
>  security/apparmor/include/lib.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/security/apparmor/include/lib.h b/security/apparmor/include/lib.h
> index 954e22ae8342..3f3b8d09f1c5 100644
> --- a/security/apparmor/include/lib.h
> +++ b/security/apparmor/include/lib.h
> @@ -56,7 +56,7 @@
>  	} while (0)
>  
>  /* Flag indicating whether initialization completed */
> -extern int apparmor_initialized __initdata;
> +extern int apparmor_initialized;
>  
>  /* fn's in lib */
>  char *aa_split_fqname(char *args, char **ns_name);
> 

Applied to xenial/master-next branch, adding the BugLink reference.

Thanks,
Kleber
diff mbox series

Patch

diff --git a/security/apparmor/include/lib.h b/security/apparmor/include/lib.h
index 954e22ae8342..3f3b8d09f1c5 100644
--- a/security/apparmor/include/lib.h
+++ b/security/apparmor/include/lib.h
@@ -56,7 +56,7 @@ 
 	} while (0)
 
 /* Flag indicating whether initialization completed */
-extern int apparmor_initialized __initdata;
+extern int apparmor_initialized;
 
 /* fn's in lib */
 char *aa_split_fqname(char *args, char **ns_name);