diff mbox

Apparamor: Fix the OOPS due to wrong header inclusion in file in Makefile(3.7.0-rc1 Kernel)

Message ID 50CF0C21.60101@posedge.com (mailing list archive)
State Not Applicable, archived
Headers show

Commit Message

Chaitanya Dec. 17, 2012, 12:12 p.m. UTC
Fix the OOPS in the apparmor security module
during the bootup.(oops points to strlen in audit_log_untrustedstring function)
Note: Actual fix lifted from Al-Viro.
 
Signed-off-by: Chaitanya T K <chaitanyatk@posedge.com>
---
 security/apparmor/Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)





--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

John Johansen Dec. 17, 2012, 12:47 p.m. UTC | #1
On 12/17/2012 04:12 AM, Chaitanya wrote:
> 
> 
> Fix the OOPS in the apparmor security module
> during the bootup.(oops points to strlen in audit_log_untrustedstring function)
> Note: Actual fix lifted from Al-Viro.
>  
> Signed-off-by: Chaitanya T K <chaitanyatk@posedge.com>

thanks for reporting, this patch was included in 3.7-rc2
see 43c422eda99b894f18d1cca17bcd2401efaf7bd0


> ---
>  security/apparmor/Makefile |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/security/apparmor/Makefile b/security/apparmor/Makefile
> index 7b3021c..5706b74 100644
> --- a/security/apparmor/Makefile
> +++ b/security/apparmor/Makefile
> @@ -57,7 +57,7 @@ cmd_make-rlim = echo "static const char *const rlim_names[RLIM_NLIMITS] = {" \
>  
>  $(obj)/capability.o : $(obj)/capability_names.h
>  $(obj)/resource.o : $(obj)/rlim_names.h
> -$(obj)/capability_names.h : $(srctree)/include/linux/capability.h \
> +$(obj)/capability_names.h : $(srctree)/include/uapi/linux/capability.h \
>  			    $(src)/Makefile
>  	$(call cmd,make-caps)
>  $(obj)/rlim_names.h : $(srctree)/include/uapi/asm-generic/resource.h \
> 
> 
> 
> 

--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Krishna Chaitanya Dec. 17, 2012, 3:17 p.m. UTC | #2
ok. But it will be good if its in the mac80211-next branch, its really
annoying :-)

On Mon, Dec 17, 2012 at 6:17 PM, John Johansen
<john.johansen@canonical.com> wrote:
> On 12/17/2012 04:12 AM, Chaitanya wrote:
>>
>>
>> Fix the OOPS in the apparmor security module
>> during the bootup.(oops points to strlen in audit_log_untrustedstring function)
>> Note: Actual fix lifted from Al-Viro.
>>
>> Signed-off-by: Chaitanya T K <chaitanyatk@posedge.com>
>
> thanks for reporting, this patch was included in 3.7-rc2
> see 43c422eda99b894f18d1cca17bcd2401efaf7bd0
>
>
>> ---
>>  security/apparmor/Makefile |    2 +-
>>  1 files changed, 1 insertions(+), 1 deletions(-)
>>
>> diff --git a/security/apparmor/Makefile b/security/apparmor/Makefile
>> index 7b3021c..5706b74 100644
>> --- a/security/apparmor/Makefile
>> +++ b/security/apparmor/Makefile
>> @@ -57,7 +57,7 @@ cmd_make-rlim = echo "static const char *const rlim_names[RLIM_NLIMITS] = {" \
>>
>>  $(obj)/capability.o : $(obj)/capability_names.h
>>  $(obj)/resource.o : $(obj)/rlim_names.h
>> -$(obj)/capability_names.h : $(srctree)/include/linux/capability.h \
>> +$(obj)/capability_names.h : $(srctree)/include/uapi/linux/capability.h \
>>                           $(src)/Makefile
>>       $(call cmd,make-caps)
>>  $(obj)/rlim_names.h : $(srctree)/include/uapi/asm-generic/resource.h \
>>
>>
>>
>>
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/security/apparmor/Makefile b/security/apparmor/Makefile
index 7b3021c..5706b74 100644
--- a/security/apparmor/Makefile
+++ b/security/apparmor/Makefile
@@ -57,7 +57,7 @@  cmd_make-rlim = echo "static const char *const rlim_names[RLIM_NLIMITS] = {" \
 
 $(obj)/capability.o : $(obj)/capability_names.h
 $(obj)/resource.o : $(obj)/rlim_names.h
-$(obj)/capability_names.h : $(srctree)/include/linux/capability.h \
+$(obj)/capability_names.h : $(srctree)/include/uapi/linux/capability.h \
 			    $(src)/Makefile
 	$(call cmd,make-caps)
 $(obj)/rlim_names.h : $(srctree)/include/uapi/asm-generic/resource.h \