Commit f6f79190 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of... 

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6: (57 commits)
  binfmt_elf: fix PT_INTERP bss handling
  TPM: Fixup boot probe timeout for tpm_tis driver
  sysfs: Add labeling support for sysfs
  LSM/SELinux: inode_{get,set,notify}secctx hooks to access LSM security context information.
  VFS: Factor out part of vfs_setxattr so it can be called from the SELinux hook for inode_setsecctx.
  KEYS: Add missing linux/tracehook.h #inclusions
  KEYS: Fix default security_session_to_parent()
  Security/SELinux: includecheck fix kernel/sysctl.c
  KEYS: security_cred_alloc_blank() should return int under all circumstances
  IMA: open new file for read
  KEYS: Add a keyctl to install a process's session keyring on its parent [try #6]
  KEYS: Extend TIF_NOTIFY_RESUME to (almost) all architectures [try #6]
  KEYS: Do some whitespace cleanups [try #6]
  KEYS: Make /proc/keys use keyid not numread as file position [try #6]
  KEYS: Add garbage collection for dead, revoked and expired keys. [try #6]
  KEYS: Flag dead keys to induce EKEYREVOKED [try #6]
  KEYS: Allow keyctl_revoke() on keys that have SETATTR but not WRITE perm [try #6]
  KEYS: Deal with dead-type keys appropriately [try #6]
  CRED: Add some configurable debugging [try #6]
  selinux: Support for the new TUN LSM hooks
  ...
parents 0d03d59d a3c8b973

Documentation/keys.txt

+38 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ This document has the following sections: 
	- Notes on accessing payload contents

	- Defining a key type

	- Request-key callback service

	- Key access filesystem

	- Garbage collection





============
@@ -113,6 +113,9 @@ Each key has a number of attributes: 


     (*) Dead. The key's type was unregistered, and so the key is now useless.



Keys in the last three states are subject to garbage collection.  See the

section on "Garbage collection".





====================

KEY SERVICE OVERVIEW
@@ -754,6 +757,26 @@ The keyctl syscall functions are: 
     successful.





 (*) Install the calling process's session keyring on its parent.



	long keyctl(KEYCTL_SESSION_TO_PARENT);



     This functions attempts to install the calling process's session keyring

     on to the calling process's parent, replacing the parent's current session

     keyring.



     The calling process must have the same ownership as its parent, the

     keyring must have the same ownership as the calling process, the calling

     process must have LINK permission on the keyring and the active LSM module

     mustn't deny permission, otherwise error EPERM will be returned.



     Error ENOMEM will be returned if there was insufficient memory to complete

     the operation, otherwise 0 will be returned to indicate success.



     The keyring will be replaced next time the parent process leaves the

     kernel and resumes executing userspace.





===============

KERNEL SERVICES

===============
@@ -1231,3 +1254,17 @@ by executing: 


In this case, the program isn't required to actually attach the key to a ring;

the rings are provided for reference.





==================

GARBAGE COLLECTION

==================



Dead keys (for which the type has been removed) will be automatically unlinked

from those keyrings that point to them and deleted as soon as possible by a

background garbage collector.



Similarly, revoked and expired keys will be garbage collected, but only after a

certain amount of time has passed.  This time is set as a number of seconds in:



	/proc/sys/kernel/keys/gc_delay

arch/alpha/include/asm/thread_info.h

+4 −1
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ register struct thread_info *__current_thread_info __asm__("$8"); 
#define TIF_UAC_SIGBUS		7

#define TIF_MEMDIE		8

#define TIF_RESTORE_SIGMASK	9	/* restore signal mask in do_signal */

#define TIF_NOTIFY_RESUME	10	/* callback before returning to user */

#define TIF_FREEZE		16	/* is freezing for suspend */



#define _TIF_SYSCALL_TRACE	(1<<TIF_SYSCALL_TRACE)
@@ -82,10 +83,12 @@ register struct thread_info *__current_thread_info __asm__("$8"); 
#define _TIF_NEED_RESCHED	(1<<TIF_NEED_RESCHED)

#define _TIF_POLLING_NRFLAG	(1<<TIF_POLLING_NRFLAG)

#define _TIF_RESTORE_SIGMASK	(1<<TIF_RESTORE_SIGMASK)

#define _TIF_NOTIFY_RESUME	(1<<TIF_NOTIFY_RESUME)

#define _TIF_FREEZE		(1<<TIF_FREEZE)



/* Work to do on interrupt/exception return.  */

#define _TIF_WORK_MASK		(_TIF_SIGPENDING | _TIF_NEED_RESCHED)

#define _TIF_WORK_MASK		(_TIF_SIGPENDING | _TIF_NEED_RESCHED | \

				 _TIF_NOTIFY_RESUME)



/* Work to do on any return to userspace.  */

#define _TIF_ALLWORK_MASK	(_TIF_WORK_MASK		\

arch/alpha/kernel/signal.c

+8 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <linux/binfmts.h>

#include <linux/bitops.h>

#include <linux/syscalls.h>

#include <linux/tracehook.h>



#include <asm/uaccess.h>

#include <asm/sigcontext.h>
@@ -683,4 +684,11 @@ do_notify_resume(struct pt_regs *regs, struct switch_stack *sw, 
{

	if (thread_info_flags & (_TIF_SIGPENDING | _TIF_RESTORE_SIGMASK))

		do_signal(regs, sw, r0, r19);



	if (thread_info_flags & _TIF_NOTIFY_RESUME) {

		clear_thread_flag(TIF_NOTIFY_RESUME);

		tracehook_notify_resume(regs);

		if (current->replacement_session_keyring)

			key_replace_session_keyring();

	}

}

arch/arm/include/asm/thread_info.h

+3 −0
Original line number Diff line number Diff line
@@ -130,11 +130,13 @@ extern void vfp_sync_state(struct thread_info *thread); 
 *  TIF_SYSCALL_TRACE	- syscall trace active

 *  TIF_SIGPENDING	- signal pending

 *  TIF_NEED_RESCHED	- rescheduling necessary

 *  TIF_NOTIFY_RESUME	- callback before returning to user

 *  TIF_USEDFPU		- FPU was used by this task this quantum (SMP)

 *  TIF_POLLING_NRFLAG	- true if poll_idle() is polling TIF_NEED_RESCHED

 */

#define TIF_SIGPENDING		0

#define TIF_NEED_RESCHED	1

#define TIF_NOTIFY_RESUME	2	/* callback before returning to user */

#define TIF_SYSCALL_TRACE	8

#define TIF_POLLING_NRFLAG	16

#define TIF_USING_IWMMXT	17
@@ -143,6 +145,7 @@ extern void vfp_sync_state(struct thread_info *thread); 


#define _TIF_SIGPENDING		(1 << TIF_SIGPENDING)

#define _TIF_NEED_RESCHED	(1 << TIF_NEED_RESCHED)

#define _TIF_NOTIFY_RESUME	(1 << TIF_NOTIFY_RESUME)

#define _TIF_SYSCALL_TRACE	(1 << TIF_SYSCALL_TRACE)

#define _TIF_POLLING_NRFLAG	(1 << TIF_POLLING_NRFLAG)

#define _TIF_USING_IWMMXT	(1 << TIF_USING_IWMMXT)

arch/arm/kernel/entry-common.S

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ fast_work_pending: 
work_pending:

	tst	r1, #_TIF_NEED_RESCHED

	bne	work_resched

	tst	r1, #_TIF_SIGPENDING

	tst	r1, #_TIF_SIGPENDING|_TIF_NOTIFY_RESUME

	beq	no_work_pending

	mov	r0, sp				@ 'regs'

	mov	r2, why				@ 'syscall'

CRA Git | Maintained and supported by SUSTech CRA and CCSE