From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 11 Jan 2012 05:51:23 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://selinuxproject.org/~jmorris/linux-security
X-Git-Tag: v3.3-rc1~105
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=e7691a1ce341c80ed9504244a36b31c025217391;p=linux.git

Merge branch 'for-linus' of git://selinuxproject.org/~jmorris/linux-security

* 'for-linus' of git://selinuxproject.org/~jmorris/linux-security: (32 commits)
  ima: fix invalid memory reference
  ima: free duplicate measurement memory
  security: update security_file_mmap() docs
  selinux: Casting (void *) value returned by kmalloc is useless
  apparmor: fix module parameter handling
  Security: tomoyo: add .gitignore file
  tomoyo: add missing rcu_dereference()
  apparmor: add missing rcu_dereference()
  evm: prevent racing during tfm allocation
  evm: key must be set once during initialization
  mpi/mpi-mpow: NULL dereference on allocation failure
  digsig: build dependency fix
  KEYS: Give key types their own lockdep class for key->sem
  TPM: fix transmit_cmd error logic
  TPM: NSC and TIS drivers X86 dependency fix
  TPM: Export wait_for_stat for other vendor specific drivers
  TPM: Use vendor specific function for status probe
  tpm_tis: add delay after aborting command
  tpm_tis: Check return code from getting timeouts/durations
  tpm: Introduce function to poll for result of self test
  ...

Fix up trivial conflict in lib/Makefile due to addition of CONFIG_MPI
and SIGSIG next to CONFIG_DQL addition.
---

e7691a1ce341c80ed9504244a36b31c025217391
diff --cc lib/Kconfig
index 7f6b8bca8c25,5634e473ff6d..201e1b33d721
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@@ -280,9 -270,35 +280,34 @@@ config AVERAG
  	  If unsure, say N.
  
  config CORDIC
 -	tristate "Cordic function"
 +	tristate "CORDIC algorithm"
  	help
 -	  The option provides arithmetic function using cordic algorithm
 -	  so its calculations are in fixed point. Modules can select this
 -	  when they require this function. Module will be called cordic.
 +	  This option provides an implementation of the CORDIC algorithm;
 +	  calculations are in fixed point. Module will be called cordic.
  
+ config MPILIB
+ 	tristate "Multiprecision maths library"
+ 	help
+ 	  Multiprecision maths library from GnuPG.
+ 	  It is used to implement RSA digital signature verification,
+ 	  which is used by IMA/EVM digital signature extension.
+ 
+ config MPILIB_EXTRA
+ 	bool "Multiprecision maths library - additional sources"
+ 	depends on MPILIB
+ 	help
+ 	  Multiprecision maths library from GnuPG.
+ 	  It is used to implement RSA digital signature verification,
+ 	  which is used by IMA/EVM digital signature extension.
+ 	  This code in unnecessary for RSA digital signature verification,
+ 	  and can be compiled if needed.
+ 
+ config DIGSIG
+ 	tristate "In-kernel signature checker"
+ 	depends on KEYS
+ 	select MPILIB
+ 	help
+ 	  Digital signature verification. Currently only RSA is supported.
+ 	  Implementation is done using GnuPG MPI library
+ 
  endmenu
diff --cc lib/Makefile
index 884ed376164d,0f5cff267aff..dace162c7e1c
--- a/lib/Makefile
+++ b/lib/Makefile
@@@ -116,8 -115,9 +116,11 @@@ obj-$(CONFIG_CPU_RMAP) += cpu_rmap.
  
  obj-$(CONFIG_CORDIC) += cordic.o
  
 +obj-$(CONFIG_DQL) += dynamic_queue_limits.o
 +
+ obj-$(CONFIG_MPILIB) += mpi/
+ obj-$(CONFIG_DIGSIG) += digsig.o
+ 
  hostprogs-y	:= gen_crc32table
  clean-files	:= crc32table.h