Skip to contentSkip to conversation

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

PATCH In review Chaitanya 3 participants 3 messages Dec 17, 2012 1 message not in the archive

Subsystems (2)
Security (LSM) Apparmor security module
lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): 201212171158.qBHBwYni003158@chaitanya-desktop

Chaitanya

author
#1 lore raw

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

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 <[email protected]>
---
 security/apparmor/Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
security/apparmor/Makefile +1 -1
index 7b3021c..5706b74 100644
@@ -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 \
maintainer
#2 lore raw
Quoted 7 lines · Chaitanya

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 <[email protected]>

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

Quoted 21 lines
---
 security/apparmor/Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
security/apparmor/Makefile +1 -1
index 7b3021c..5706b74 100644
@@ -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 \
#3 lore raw

ok. But it will be good if its in the mac80211-next branch, its really annoying :-)

Quoted 39 lines · John Johansen
Quoted 7 lines · Chaitanya

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 <[email protected]>

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

Quoted 13 lines
---
 security/apparmor/Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
security/apparmor/Makefile +0 -0
index 7b3021c..5706b74 100644

security/apparmor/Makefile cmd_make-rlim = echo "static const char *const rlim_names[RLIM_NLIMITS] = {" \ · line 63

Quoted 8 lines
security/apparmor/Makefile +1 -1
@@ -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 [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html