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

Commit e9e349b0 authored by David Howells's avatar David Howells Committed by James Morris
Browse files

KEYS: Disperse linux/key_ui.h 



Disperse the bits of linux/key_ui.h as the reason they were put here (keyfs)
didn't get in.

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Reviewed-by: default avatarJames Morris <jmorris@namei.org>
Signed-off-by: default avatarJames Morris <jmorris@namei.org>
parent 76aac0e9

include/linux/key-ui.h→include/keys/keyring-type.h

+31 −0
Original line number Diff line number Diff line 
/* key-ui.h: key userspace interface stuff

/* Keyring key type

 *

 * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved.

 * Copyright (C) 2008 Red Hat, Inc. All Rights Reserved.

 * Written by David Howells (dhowells@redhat.com)

 *

 * This program is free software; you can redistribute it and/or
@@ -9,23 +9,11 @@ 
 * 2 of the License, or (at your option) any later version.

 */



#ifndef _LINUX_KEY_UI_H

#define _LINUX_KEY_UI_H

#ifndef _KEYS_KEYRING_TYPE_H

#define _KEYS_KEYRING_TYPE_H



#include <linux/key.h>



/* the key tree */

extern struct rb_root key_serial_tree;

extern spinlock_t key_serial_lock;



/* required permissions */

#define	KEY_VIEW	0x01	/* require permission to view attributes */

#define	KEY_READ	0x02	/* require permission to read content */

#define	KEY_WRITE	0x04	/* require permission to update / modify */

#define	KEY_SEARCH	0x08	/* require permission to search (keyring) or find (key) */

#define	KEY_LINK	0x10	/* require permission to link */

#define	KEY_SETATTR	0x20	/* require permission to change attributes */

#define	KEY_ALL		0x3f	/* all the above permissions */

#include <linux/rcupdate.h>



/*

 * the keyring payload contains a list of the keys to which the keyring is
@@ -39,28 +27,5 @@ struct keyring_list { 
	struct key	*keys[0];

};



/*

 * check to see whether permission is granted to use a key in the desired way

 */

extern int key_task_permission(const key_ref_t key_ref,

			       struct task_struct *context,

			       key_perm_t perm);



static inline int key_permission(const key_ref_t key_ref, key_perm_t perm)

{

	return key_task_permission(key_ref, current, perm);

}



extern key_ref_t lookup_user_key(struct task_struct *context,

				 key_serial_t id, int create, int partial,

				 key_perm_t perm);



extern long join_session_keyring(const char *name);



extern struct key_type *key_type_lookup(const char *type);

extern void key_type_put(struct key_type *ktype);



#define key_negative_timeout	60	/* default timeout on a negative key's existence */





#endif /* _LINUX_KEY_UI_H */
 
#endif /* _KEYS_KEYRING_TYPE_H */

security/keys/internal.h

+30 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 
#define _INTERNAL_H



#include <linux/key-type.h>

#include <linux/key-ui.h>



static inline __attribute__((format(printf, 1, 2)))

void no_printk(const char *fmt, ...)
@@ -82,6 +81,9 @@ extern struct mutex key_construction_mutex; 
extern wait_queue_head_t request_key_conswq;





extern struct key_type *key_type_lookup(const char *type);

extern void key_type_put(struct key_type *ktype);



extern int __key_link(struct key *keyring, struct key *key);



extern key_ref_t __keyring_search_one(key_ref_t keyring_ref,
@@ -118,6 +120,33 @@ extern struct key *request_key_and_link(struct key_type *type, 
					struct key *dest_keyring,

					unsigned long flags);



extern key_ref_t lookup_user_key(struct task_struct *context,

				 key_serial_t id, int create, int partial,

				 key_perm_t perm);



extern long join_session_keyring(const char *name);



/*

 * check to see whether permission is granted to use a key in the desired way

 */

extern int key_task_permission(const key_ref_t key_ref,

			       struct task_struct *context,

			       key_perm_t perm);



static inline int key_permission(const key_ref_t key_ref, key_perm_t perm)

{

	return key_task_permission(key_ref, current, perm);

}



/* required permissions */

#define	KEY_VIEW	0x01	/* require permission to view attributes */

#define	KEY_READ	0x02	/* require permission to read content */

#define	KEY_WRITE	0x04	/* require permission to update / modify */

#define	KEY_SEARCH	0x08	/* require permission to search (keyring) or find (key) */

#define	KEY_LINK	0x10	/* require permission to link */

#define	KEY_SETATTR	0x20	/* require permission to change attributes */

#define	KEY_ALL		0x3f	/* all the above permissions */



/*

 * request_key authorisation

 */

security/keys/keyring.c

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <linux/security.h>

#include <linux/seq_file.h>

#include <linux/err.h>

#include <keys/keyring-type.h>

#include <asm/uaccess.h>

#include "internal.h"

security/keys/request_key.c

+2 −0
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ 
#include <linux/slab.h>

#include "internal.h"



#define key_negative_timeout	60	/* default timeout on a negative key's existence */



/*

 * wait_on_bit() sleep function for uninterruptible waiting

 */