Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit e9e349b051d98799b743ebf248cc2d986fedf090

Authored by David Howells
Committed by James Morris
1 parent 76aac0e9a1
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

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: David Howells <dhowells@redhat.com>
Reviewed-by: James Morris <jmorris@namei.org>
Signed-off-by: James Morris <jmorris@namei.org>

Showing 5 changed files with 64 additions and 67 deletions Side-by-side Diff

include/keys/keyring-type.h
Diff comments   View file @ e9e349b
  1 +/* Keyring key type
  2 + *
  3 + * Copyright (C) 2008 Red Hat, Inc. All Rights Reserved.
  4 + * Written by David Howells (dhowells@redhat.com)
  5 + *
  6 + * This program is free software; you can redistribute it and/or
  7 + * modify it under the terms of the GNU General Public License
  8 + * as published by the Free Software Foundation; either version
  9 + * 2 of the License, or (at your option) any later version.
  10 + */
  11 +
  12 +#ifndef _KEYS_KEYRING_TYPE_H
  13 +#define _KEYS_KEYRING_TYPE_H
  14 +
  15 +#include <linux/key.h>
  16 +#include <linux/rcupdate.h>
  17 +
  18 +/*
  19 + * the keyring payload contains a list of the keys to which the keyring is
  20 + * subscribed
  21 + */
  22 +struct keyring_list {
  23 + struct rcu_head rcu; /* RCU deletion hook */
  24 + unsigned short maxkeys; /* max keys this list can hold */
  25 + unsigned short nkeys; /* number of keys currently held */
  26 + unsigned short delkey; /* key to be unlinked by RCU */
  27 + struct key *keys[0];
  28 +};
  29 +
  30 +
  31 +#endif /* _KEYS_KEYRING_TYPE_H */
include/linux/key-ui.h
View file @ e9e349b
1   -/* key-ui.h: key userspace interface stuff
2   - *
3   - * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved.
4   - * Written by David Howells (dhowells@redhat.com)
5   - *
6   - * This program is free software; you can redistribute it and/or
7   - * modify it under the terms of the GNU General Public License
8   - * as published by the Free Software Foundation; either version
9   - * 2 of the License, or (at your option) any later version.
10   - */
11   -
12   -#ifndef _LINUX_KEY_UI_H
13   -#define _LINUX_KEY_UI_H
14   -
15   -#include <linux/key.h>
16   -
17   -/* the key tree */
18   -extern struct rb_root key_serial_tree;
19   -extern spinlock_t key_serial_lock;
20   -
21   -/* required permissions */
22   -#define KEY_VIEW 0x01 /* require permission to view attributes */
23   -#define KEY_READ 0x02 /* require permission to read content */
24   -#define KEY_WRITE 0x04 /* require permission to update / modify */
25   -#define KEY_SEARCH 0x08 /* require permission to search (keyring) or find (key) */
26   -#define KEY_LINK 0x10 /* require permission to link */
27   -#define KEY_SETATTR 0x20 /* require permission to change attributes */
28   -#define KEY_ALL 0x3f /* all the above permissions */
29   -
30   -/*
31   - * the keyring payload contains a list of the keys to which the keyring is
32   - * subscribed
33   - */
34   -struct keyring_list {
35   - struct rcu_head rcu; /* RCU deletion hook */
36   - unsigned short maxkeys; /* max keys this list can hold */
37   - unsigned short nkeys; /* number of keys currently held */
38   - unsigned short delkey; /* key to be unlinked by RCU */
39   - struct key *keys[0];
40   -};
41   -
42   -/*
43   - * check to see whether permission is granted to use a key in the desired way
44   - */
45   -extern int key_task_permission(const key_ref_t key_ref,
46   - struct task_struct *context,
47   - key_perm_t perm);
48   -
49   -static inline int key_permission(const key_ref_t key_ref, key_perm_t perm)
50   -{
51   - return key_task_permission(key_ref, current, perm);
52   -}
53   -
54   -extern key_ref_t lookup_user_key(struct task_struct *context,
55   - key_serial_t id, int create, int partial,
56   - key_perm_t perm);
57   -
58   -extern long join_session_keyring(const char *name);
59   -
60   -extern struct key_type *key_type_lookup(const char *type);
61   -extern void key_type_put(struct key_type *ktype);
62   -
63   -#define key_negative_timeout 60 /* default timeout on a negative key's existence */
64   -
65   -
66   -#endif /* _LINUX_KEY_UI_H */
security/keys/internal.h
Diff comments   View file @ e9e349b
... ... @@ -13,7 +13,6 @@
13 13 #define _INTERNAL_H
14 14  
15 15 #include <linux/key-type.h>
16   -#include <linux/key-ui.h>
17 16  
18 17 static inline __attribute__((format(printf, 1, 2)))
19 18 void no_printk(const char *fmt, ...)
... ... @@ -82,6 +81,9 @@
82 81 extern wait_queue_head_t request_key_conswq;
83 82  
84 83  
  84 +extern struct key_type *key_type_lookup(const char *type);
  85 +extern void key_type_put(struct key_type *ktype);
  86 +
85 87 extern int __key_link(struct key *keyring, struct key *key);
86 88  
87 89 extern key_ref_t __keyring_search_one(key_ref_t keyring_ref,
... ... @@ -117,6 +119,33 @@
117 119 void *aux,
118 120 struct key *dest_keyring,
119 121 unsigned long flags);
  122 +
  123 +extern key_ref_t lookup_user_key(struct task_struct *context,
  124 + key_serial_t id, int create, int partial,
  125 + key_perm_t perm);
  126 +
  127 +extern long join_session_keyring(const char *name);
  128 +
  129 +/*
  130 + * check to see whether permission is granted to use a key in the desired way
  131 + */
  132 +extern int key_task_permission(const key_ref_t key_ref,
  133 + struct task_struct *context,
  134 + key_perm_t perm);
  135 +
  136 +static inline int key_permission(const key_ref_t key_ref, key_perm_t perm)
  137 +{
  138 + return key_task_permission(key_ref, current, perm);
  139 +}
  140 +
  141 +/* required permissions */
  142 +#define KEY_VIEW 0x01 /* require permission to view attributes */
  143 +#define KEY_READ 0x02 /* require permission to read content */
  144 +#define KEY_WRITE 0x04 /* require permission to update / modify */
  145 +#define KEY_SEARCH 0x08 /* require permission to search (keyring) or find (key) */
  146 +#define KEY_LINK 0x10 /* require permission to link */
  147 +#define KEY_SETATTR 0x20 /* require permission to change attributes */
  148 +#define KEY_ALL 0x3f /* all the above permissions */
120 149  
121 150 /*
122 151 * request_key authorisation
security/keys/keyring.c
Diff comments   View file @ e9e349b
... ... @@ -16,6 +16,7 @@
16 16 #include <linux/security.h>
17 17 #include <linux/seq_file.h>
18 18 #include <linux/err.h>
  19 +#include <keys/keyring-type.h>
19 20 #include <asm/uaccess.h>
20 21 #include "internal.h"
21 22  
security/keys/request_key.c
Diff comments   View file @ e9e349b
... ... @@ -19,6 +19,8 @@
19 19 #include <linux/slab.h>
20 20 #include "internal.h"
21 21  
  22 +#define key_negative_timeout 60 /* default timeout on a negative key's existence */
  23 +
22 24 /*
23 25 * wait_on_bit() sleep function for uninterruptible waiting
24 26 */