linux-toradex.git/security/tomoyo, branch v3.3.2

TOMOYO: Fix mount flags checking order.

2012-04-13T16:13:56+00:00

commit df91e49477a9be15921cb2854e1d12a3bdb5e425 upstream.

Userspace can pass in arbitrary combinations of MS_* flags to mount().

If both MS_BIND and one of MS_SHARED/MS_PRIVATE/MS_SLAVE/MS_UNBINDABLE are
passed, device name which should be checked for MS_BIND was not checked because
MS_SHARED/MS_PRIVATE/MS_SLAVE/MS_UNBINDABLE had higher priority than MS_BIND.

If both one of MS_BIND/MS_MOVE and MS_REMOUNT are passed, device name which
should not be checked for MS_REMOUNT was checked because MS_BIND/MS_MOVE had
higher priority than MS_REMOUNT.

Fix these bugs by changing priority to MS_REMOUNT -> MS_BIND ->
MS_SHARED/MS_PRIVATE/MS_SLAVE/MS_UNBINDABLE -> MS_MOVE as with do_mount() does.

Also, unconditionally return -EINVAL if more than one of
MS_SHARED/MS_PRIVATE/MS_SLAVE/MS_UNBINDABLE is passed so that TOMOYO will not
generate inaccurate audit logs, for commit 7a2e8a8f "VFS: Sanity check mount
flags passed to change_mnt_propagation()" clarified that these flags must be
exclusively passed.

Signed-off-by: Tetsuo Handa 
Signed-off-by: James Morris 
Signed-off-by: Greg Kroah-Hartman

TOMOYO: Accept \000 as a valid character.

2012-01-17T23:40:59+00:00

TOMOYO 2.5 in Linux 3.2 and later handles Unix domain socket's address.
Thus, tomoyo_correct_word2() needs to accept \000 as a valid character, or
TOMOYO 2.5 cannot handle Unix domain's abstract socket address.

Reported-by: Steven Allen 
Signed-off-by: Tetsuo Handa 
CC: stable@vger.kernel.org [3.2+]
Signed-off-by: James Morris

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

2012-01-11T05:51:23+00:00

* '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.

Merge branch 'next' into for-linus

2012-01-09T01:16:48+00:00

Conflicts:
	security/integrity/evm/evm_crypto.c

Resolved upstream fix vs. next conflict manually.

Signed-off-by: James Morris

switch security_path_chmod() to struct path *

2012-01-07T04:16:53+00:00

Signed-off-by: Al Viro

Merge branches 'vfsmount-guts', 'umode_t' and 'partitions' into Z

2012-01-07T04:15:54+00:00

vfs: trim includes a bit

2012-01-04T03:57:13+00:00

[folded fix for missing magic.h from Tetsuo Handa]

Signed-off-by: Al Viro

switch ->path_mknod() to umode_t

2012-01-04T03:55:19+00:00

Signed-off-by: Al Viro

switch ->path_mkdir() to umode_t

2012-01-04T03:55:18+00:00

Signed-off-by: Al Viro

tomoyo_mini_stat: switch to umode_t

2012-01-04T03:55:18+00:00

Signed-off-by: Al Viro