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

Commit 0f6e0e84 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: (33 commits)
  AppArmor: kill unused macros in lsm.c
  AppArmor: cleanup generated files correctly
  KEYS: Add an iovec version of KEYCTL_INSTANTIATE
  KEYS: Add a new keyctl op to reject a key with a specified error code
  KEYS: Add a key type op to permit the key description to be vetted
  KEYS: Add an RCU payload dereference macro
  AppArmor: Cleanup make file to remove cruft and make it easier to read
  SELinux: implement the new sb_remount LSM hook
  LSM: Pass -o remount options to the LSM
  SELinux: Compute SID for the newly created socket
  SELinux: Socket retains creator role and MLS attribute
  SELinux: Auto-generate security_is_socket_class
  TOMOYO: Fix memory leak upon file open.
  Revert "selinux: simplify ioctl checking"
  selinux: drop unused packet flow permissions
  selinux: Fix packet forwarding checks on postrouting
  selinux: Fix wrong checks for selinux_policycap_netpeer
  selinux: Fix check for xfrm selinux context algorithm
  ima: remove unnecessary call to ima_must_measure
  IMA: remove IMA imbalance checking
  ...
parents 0d2ecee2 a002951c

Documentation/keys-request-key.txt

+5 −4
Original line number Diff line number Diff line
@@ -127,14 +127,15 @@ This is because process A's keyrings can't simply be attached to 
of them, and (b) it requires the same UID/GID/Groups all the way through.





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

NEGATIVE INSTANTIATION

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

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

NEGATIVE INSTANTIATION AND REJECTION

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



Rather than instantiating a key, it is possible for the possessor of an

authorisation key to negatively instantiate a key that's under construction.

This is a short duration placeholder that causes any attempt at re-requesting

the key whilst it exists to fail with error ENOKEY.

the key whilst it exists to fail with error ENOKEY if negated or the specified

error if rejected.



This is provided to prevent excessive repeated spawning of /sbin/request-key

processes for a key that will never be obtainable.

Documentation/keys.txt

+24 −4
Original line number Diff line number Diff line
@@ -637,6 +637,9 @@ The keyctl syscall functions are: 
	long keyctl(KEYCTL_INSTANTIATE, key_serial_t key,

		    const void *payload, size_t plen,

		    key_serial_t keyring);

	long keyctl(KEYCTL_INSTANTIATE_IOV, key_serial_t key,

		    const struct iovec *payload_iov, unsigned ioc,

		    key_serial_t keyring);



     If the kernel calls back to userspace to complete the instantiation of a

     key, userspace should use this call to supply data for the key before the
@@ -652,11 +655,16 @@ The keyctl syscall functions are: 


     The payload and plen arguments describe the payload data as for add_key().



     The payload_iov and ioc arguments describe the payload data in an iovec

     array instead of a single buffer.





 (*) Negatively instantiate a partially constructed key.



	long keyctl(KEYCTL_NEGATE, key_serial_t key,

		    unsigned timeout, key_serial_t keyring);

	long keyctl(KEYCTL_REJECT, key_serial_t key,

		    unsigned timeout, unsigned error, key_serial_t keyring);



     If the kernel calls back to userspace to complete the instantiation of a

     key, userspace should use this call mark the key as negative before the
@@ -669,6 +677,10 @@ The keyctl syscall functions are: 
     that keyring, however all the constraints applying in KEYCTL_LINK apply in

     this case too.



     If the key is rejected, future searches for it will return the specified

     error code until the rejected key expires.  Negating the key is the same

     as rejecting the key with ENOKEY as the error code.





 (*) Set the default request-key destination keyring.
@@ -1062,6 +1074,13 @@ The structure has a number of fields, some of which are mandatory: 
     viable.





 (*) int (*vet_description)(const char *description);



     This optional method is called to vet a key description.  If the key type

     doesn't approve of the key description, it may return an error, otherwise

     it should return 0.





 (*) int (*instantiate)(struct key *key, const void *data, size_t datalen);



     This method is called to attach a payload to a key during construction.
@@ -1231,10 +1250,11 @@ hand the request off to (perhaps a path held in placed in another key by, for 
example, the KDE desktop manager).



The program (or whatever it calls) should finish construction of the key by

calling KEYCTL_INSTANTIATE, which also permits it to cache the key in one of

the keyrings (probably the session ring) before returning. Alternatively, the

key can be marked as negative with KEYCTL_NEGATE; this also permits the key to

be cached in one of the keyrings.

calling KEYCTL_INSTANTIATE or KEYCTL_INSTANTIATE_IOV, which also permits it to

cache the key in one of the keyrings (probably the session ring) before

returning.  Alternatively, the key can be marked as negative with KEYCTL_NEGATE

or KEYCTL_REJECT; this also permits the key to be cached in one of the

keyrings.



If it returns with the key remaining in the unconstructed state, the key will

be marked as being negative, it will be added to the session keyring, and an

arch/x86/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -2130,6 +2130,11 @@ config SYSVIPC_COMPAT 
	def_bool y

	depends on COMPAT && SYSVIPC



config KEYS_COMPAT

	bool

	depends on COMPAT && KEYS

	default y



endmenu

fs/btrfs/inode.c

+7 −6
Original line number Diff line number Diff line
@@ -90,13 +90,14 @@ static noinline int cow_file_range(struct inode *inode, 
				   unsigned long *nr_written, int unlock);



static int btrfs_init_inode_security(struct btrfs_trans_handle *trans,

				     struct inode *inode,  struct inode *dir)

				     struct inode *inode,  struct inode *dir,

				     const struct qstr *qstr)

{

	int err;



	err = btrfs_init_acl(trans, inode, dir);

	if (!err)

		err = btrfs_xattr_security_init(trans, inode, dir);

		err = btrfs_xattr_security_init(trans, inode, dir, qstr);

	return err;

}
@@ -4704,7 +4705,7 @@ static int btrfs_mknod(struct inode *dir, struct dentry *dentry, 
	if (IS_ERR(inode))

		goto out_unlock;



	err = btrfs_init_inode_security(trans, inode, dir);

	err = btrfs_init_inode_security(trans, inode, dir, &dentry->d_name);

	if (err) {

		drop_inode = 1;

		goto out_unlock;
@@ -4765,7 +4766,7 @@ static int btrfs_create(struct inode *dir, struct dentry *dentry, 
	if (IS_ERR(inode))

		goto out_unlock;



	err = btrfs_init_inode_security(trans, inode, dir);

	err = btrfs_init_inode_security(trans, inode, dir, &dentry->d_name);

	if (err) {

		drop_inode = 1;

		goto out_unlock;
@@ -4891,7 +4892,7 @@ static int btrfs_mkdir(struct inode *dir, struct dentry *dentry, int mode) 


	drop_on_err = 1;



	err = btrfs_init_inode_security(trans, inode, dir);

	err = btrfs_init_inode_security(trans, inode, dir, &dentry->d_name);

	if (err)

		goto out_fail;
@@ -7103,7 +7104,7 @@ static int btrfs_symlink(struct inode *dir, struct dentry *dentry, 
	if (IS_ERR(inode))

		goto out_unlock;



	err = btrfs_init_inode_security(trans, inode, dir);

	err = btrfs_init_inode_security(trans, inode, dir, &dentry->d_name);

	if (err) {

		drop_inode = 1;

		goto out_unlock;

fs/btrfs/xattr.c

+4 −2
Original line number Diff line number Diff line
@@ -370,7 +370,8 @@ int btrfs_removexattr(struct dentry *dentry, const char *name) 
}



int btrfs_xattr_security_init(struct btrfs_trans_handle *trans,

			      struct inode *inode, struct inode *dir)

			      struct inode *inode, struct inode *dir,

			      const struct qstr *qstr)

{

	int err;

	size_t len;
@@ -378,7 +379,8 @@ int btrfs_xattr_security_init(struct btrfs_trans_handle *trans, 
	char *suffix;

	char *name;



	err = security_inode_init_security(inode, dir, &suffix, &value, &len);

	err = security_inode_init_security(inode, dir, qstr, &suffix, &value,

					   &len);

	if (err) {

		if (err == -EOPNOTSUPP)

			return 0;