change system file

hc

2024-10-09 244b2c5ca8b14627e4a17755e5922221e121c771

 kernel/security/keys/permission.c
..
..
@@ -1,15 +1,11 @@
1
+// SPDX-License-Identifier: GPL-2.0-or-later
1
2
 /* Key permission checking
2
3
  *
3
4
  * Copyright (C) 2005 Red Hat, Inc. All Rights Reserved.
4
5
  * 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
6
  */
11
7
 
12
-#include <linux/module.h>
8
+#include <linux/export.h>
13
9
 #include <linux/security.h>
14
10
 #include "internal.h"
15
11
 
..
..
@@ -17,7 +13,7 @@
17
13
  * key_task_permission - Check a key can be used
18
14
  * @key_ref: The key to check.
19
15
  * @cred: The credentials to use.
20
- * @perm: The permissions to check for.
16
+ * @need_perm: The permission required.
21
17
  *
22
18
  * Check to see whether permission is granted to use a key in the desired way,
23
19
  * but permit the security modules to override.
..
..
@@ -28,11 +24,29 @@
28
24
  * permissions bits or the LSM check.
29
25
  */
30
26
 int key_task_permission(const key_ref_t key_ref, const struct cred *cred,
31
-			unsigned perm)
27
+			enum key_need_perm need_perm)
32
28
 {
33
29
 	struct key *key;
34
-	key_perm_t kperm;
30
+	key_perm_t kperm, mask;
35
31
 	int ret;
32
+
33
+	switch (need_perm) {
34
+	default:
35
+		WARN_ON(1);
36
+		return -EACCES;
37
+	case KEY_NEED_UNLINK:
38
+	case KEY_SYSADMIN_OVERRIDE:
39
+	case KEY_AUTHTOKEN_OVERRIDE:
40
+	case KEY_DEFER_PERM_CHECK:
41
+		goto lsm;
42
+
43
+	case KEY_NEED_VIEW:	mask = KEY_OTH_VIEW;	break;
44
+	case KEY_NEED_READ:	mask = KEY_OTH_READ;	break;
45
+	case KEY_NEED_WRITE:	mask = KEY_OTH_WRITE;	break;
46
+	case KEY_NEED_SEARCH:	mask = KEY_OTH_SEARCH;	break;
47
+	case KEY_NEED_LINK:	mask = KEY_OTH_LINK;	break;
48
+	case KEY_NEED_SETATTR:	mask = KEY_OTH_SETATTR;	break;
49
+	}
36
50
 
37
51
 	key = key_ref_to_ptr(key_ref);
38
52
 
..
..
@@ -68,13 +82,12 @@
68
82
 	if (is_key_possessed(key_ref))
69
83
 		kperm |= key->perm >> 24;
70
84
 
71
-	kperm = kperm & perm & KEY_NEED_ALL;
72
-
73
-	if (kperm != perm)
85
+	if ((kperm & mask) != mask)
74
86
 		return -EACCES;
75
87
 
76
88
 	/* let LSM be the final arbiter */
77
-	return security_key_permission(key_ref, cred, perm);
89
+lsm:
90
+	return security_key_permission(key_ref, cred, need_perm);
78
91
 }
79
92
 EXPORT_SYMBOL(key_task_permission);
80
93