Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 43c422ed authored by John Johansen's avatar John Johansen Committed by Linus Torvalds
Browse files

apparmor: fix apparmor OOPS in audit_log_untrustedstring+0x1c/0x40 



The capability defines have moved causing the auto generated names
of capabilities that apparmor uses in logging to be incorrect.

Fix the autogenerated table source to uapi/linux/capability.h

Reported-by: default avatarYanHong <clouds.yan@gmail.com>
Reported-by: default avatarKrzysztof Kolasa <kkolasa@winsoft.pl>
Analyzed-by: default avatarAl Viro <viro@ZenIV.linux.org.uk>
Signed-off-by: default avatarJohn Johansen <john.johansen@canonical.com>
Acked-by: default avatarDavid Howells <dhowells@redhat.com>
Acked-by: default avatarJames Morris <james.l.morris@oracle.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 985c9e61

security/apparmor/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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 \