]> git.baikalelectronics.ru Git - kernel.git/commit
Revert "ima: define '_ima' as a builtin 'trusted' keyring"
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 24 Nov 2013 00:36:35 +0000 (16:36 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 24 Nov 2013 00:36:35 +0000 (16:36 -0800)
commit5559860b3c7b673fa447db3dc181ef888d6bc8e7
tree80b9e7de72353048b5e933d634d64bd14d0eb00c
parentfaab87ed5fcdaf9e624945da8ae3d5433db639fa
Revert "ima: define '_ima' as a builtin 'trusted' keyring"

This reverts commit e5711947646d05bccbbfb6f052fa33e0002a2778, which
caused the following build error:

  security/integrity/digsig.c:70:5: error: redefinition of ‘integrity_init_keyring’
  security/integrity/integrity.h:149:12: note: previous definition of ‘integrity_init_keyring’ w
  security/integrity/integrity.h:149:12: warning: ‘integrity_init_keyring’ defined but not used

reported by Krzysztof Kolasa. Mimi says:

 "I made the classic mistake of requesting this patch to be upstreamed
  at the last second, rather than waiting until the next open window.

  At this point, the best course would probably be to revert the two
  commits and fix them for the next open window"

Reported-by: Krzysztof Kolasa <kkolasa@winsoft.pl>
Acked-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
security/integrity/digsig.c
security/integrity/ima/Kconfig
security/integrity/ima/ima_appraise.c
security/integrity/integrity.h