Create Documentation/security/, move LSM-, credentials-, and keys-related files from Documentation/ to Documentation/security/, add Documentation/security/00-INDEX, and update all occurrences of Documentation/<moved_file> to Documentation/security/<moved_file>.

Randy Dunlap committed 15 years ago

Commit d410fa41 parent 61c4f2c23 files · +43 −27Browse files

Unified · Split

23 files

Documentation/00-INDEX +2 −4
Documentation/filesystems/nfs/idmapper.txt +2 −2
Documentation/networking/dns_resolver.txt +2 −2
Documentation/security/00-INDEX +18 −0
Documentation/security/SELinux.txt +0 −0
Documentation/security/Smack.txt +0 −0
Documentation/security/apparmor.txt +0 −0
Documentation/security/credentials.txt +1 −1
Documentation/security/keys-request-key.txt +2 −2
Documentation/security/keys-trusted-encrypted.txt +0 −0
Documentation/security/keys.txt +2 −2
Documentation/security/tomoyo.txt +0 −0
MAINTAINERS +3 −3
include/linux/cred.h +1 −1
include/linux/key.h +1 −1
kernel/cred.c +1 −1
scripts/selinux/README +1 −1
security/apparmor/match.c +1 −1
security/apparmor/policy_unpack.c +2 −2
security/keys/encrypted.c +1 −1
security/keys/request_key.c +1 −1
security/keys/request_key_auth.c +1 −1
security/keys/trusted.c +1 −1

@@ -192,10 +192,6 @@ kernel-docs.txt · 191 unmodified lines
192	192	- listing of various WWW + books that document kernel internals.
193	193	kernel-parameters.txt
194	194	- summary listing of command line / boot prompt args for the kernel.
195		−keys-request-key.txt
196		− - description of the kernel key request service.
197		−keys.txt
198		− - description of the kernel key retention service.
199	195	kobject.txt
200	196	- info of the kobject infrastructure of the Linux kernel.
201	197	kprobes.txt
@@ -294,6 +290,8 @@ scheduler/ · 92 unmodified lines
294	290	- directory with info on the scheduler.
295	291	scsi/
296	292	- directory with info on Linux scsi support.
	293	+security/
	294	+ - directory that contains security-related info
297	295	serial/
298	296	- directory with info on the low level serial API.
299	297	serial-console.txt

Documentation/filesystems/nfs/idmapper.txt+2−2

@@ -47,8 +47,8 @@ request-key will find the first matching line and corresponding program. In · 46 unmodified lines
47	47	this case, /some/other/program will handle all uid lookups and
48	48	/usr/sbin/nfs.idmap will handle gid, user, and group lookups.
49	49
50		−See <file:Documentation/keys-request-keys.txt> for more information about the
51		−request-key function.
	50	+See <file:Documentation/security/keys-request-keys.txt> for more information
	51	+about the request-key function.
52	52
53	53
54	54	=========

Documentation/networking/dns_resolver.txt+2−2

@@ -139,8 +139,8 @@ the key will be discarded and recreated when the data it holds has expired. · 138 unmodified lines
139	139	dns_query() returns a copy of the value attached to the key, or an error if
140	140	that is indicated instead.
141	141
142		−See <file:Documentation/keys-request-key.txt> for further information about
143		−request-key function.
	142	+See <file:Documentation/security/keys-request-key.txt> for further
	143	+information about request-key function.
144	144
145	145
146	146	=========

Documentation/security/00-INDEX+18−0

@@ -0,0 +1,18 @@
	1	+00-INDEX
	2	+ - this file.
	3	+SELinux.txt
	4	+ - how to get started with the SELinux security enhancement.
	5	+Smack.txt
	6	+ - documentation on the Smack Linux Security Module.
	7	+apparmor.txt
	8	+ - documentation on the AppArmor security extension.
	9	+credentials.txt
	10	+ - documentation about credentials in Linux.
	11	+keys-request-key.txt
	12	+ - description of the kernel key request service.
	13	+keys-trusted-encrypted.txt
	14	+ - info on the Trusted and Encrypted keys in the kernel key ring service.
	15	+keys.txt
	16	+ - description of the kernel key retention service.
	17	+tomoyo.txt
	18	+ - documentation on the TOMOYO Linux Security Module.

Documentation/security/SELinux.txtrenamed from Documentation/SELinux.txt+0−0

File renamed without changes.

Documentation/security/Smack.txtrenamed from Documentation/Smack.txt+0−0

File renamed without changes.

Documentation/security/apparmor.txtrenamed from Documentation/apparmor.txt+0−0

File renamed without changes.

Documentation/security/credentials.txtrenamed from Documentation/credentials.txt+1−1

@@ -216,7 +216,7 @@ The Linux kernel supports the following types of credentials: · 215 unmodified lines
216	216	When a process accesses a key, if not already present, it will normally be
217	217	cached on one of these keyrings for future accesses to find.
218	218
219		− For more information on using keys, see Documentation/keys.txt.
	219	+ For more information on using keys, see Documentation/security/keys.txt.
220	220
221	221	(5) LSM
222	222

Documentation/security/keys-request-key.txtrenamed from Documentation/keys-request-key.txt+2−2

@@ -3,8 +3,8 @@ · 2 unmodified lines
3	3	===================
4	4
5	5	The key request service is part of the key retention service (refer to
6		−Documentation/keys.txt). This document explains more fully how the requesting
7		−algorithm works.
	6	+Documentation/security/keys.txt). This document explains more fully how
	7	+the requesting algorithm works.
8	8
9	9	The process starts by either the kernel requesting a service by calling
10	10	request_key*():

Documentation/security/keys-trusted-encrypted.txtrenamed from Documentation/keys-trusted-encrypted.txt+0−0

File renamed without changes.

Documentation/security/keys.txtrenamed from Documentation/keys.txt+2−2

@@ -434,7 +434,7 @@ The main syscalls are: · 433 unmodified lines
434	434	/sbin/request-key will be invoked in an attempt to obtain a key. The
435	435	callout_info string will be passed as an argument to the program.
436	436
437		− See also Documentation/keys-request-key.txt.
	437	+ See also Documentation/security/keys-request-key.txt.
438	438
439	439
440	440	The keyctl syscall functions are:
@@ -864,7 +864,7 @@ payload contents" for more information. · 423 unmodified lines
864	864	If successful, the key will have been attached to the default keyring for
865	865	implicitly obtained request-key keys, as set by KEYCTL_SET_REQKEY_KEYRING.
866	866
867		− See also Documentation/keys-request-key.txt.
	867	+ See also Documentation/security/keys-request-key.txt.
868	868
869	869
870	870	(*) To search for a key, passing auxiliary data to the upcaller, call:

Documentation/security/tomoyo.txtrenamed from Documentation/tomoyo.txt+0−0

File renamed without changes.

MAINTAINERS+3−3

@@ -3705,7 +3705,7 @@ KEYS/KEYRINGS: · 3704 unmodified lines
3705	3705	M: David Howells <dhowells@redhat.com>
3706	3706	L: keyrings@linux-nfs.org
3707	3707	S: Maintained
3708		−F: Documentation/keys.txt
	3708	+F: Documentation/security/keys.txt
3709	3709	F: include/linux/key.h
3710	3710	F: include/linux/key-type.h
3711	3711	F: include/keys/
@@ -3717,7 +3717,7 @@ M: Mimi Zohar <zohar@us.ibm.com> · 5 unmodified lines
3717	3717	L: linux-security-module@vger.kernel.org
3718	3718	L: keyrings@linux-nfs.org
3719	3719	S: Supported
3720		−F: Documentation/keys-trusted-encrypted.txt
	3720	+F: Documentation/security/keys-trusted-encrypted.txt
3721	3721	F: include/keys/trusted-type.h
3722	3722	F: security/keys/trusted.c
3723	3723	F: security/keys/trusted.h
@@ -3728,7 +3728,7 @@ M: David Safford <safford@watson.ibm.com> · 4 unmodified lines
3728	3728	L: linux-security-module@vger.kernel.org
3729	3729	L: keyrings@linux-nfs.org
3730	3730	S: Supported
3731		−F: Documentation/keys-trusted-encrypted.txt
	3731	+F: Documentation/security/keys-trusted-encrypted.txt
3732	3732	F: include/keys/encrypted-type.h
3733	3733	F: security/keys/encrypted.c
3734	3734	F: security/keys/encrypted.h

include/linux/cred.h+1−1

@@ -1,4 +1,4 @@
1		−/* Credentials management - see Documentation/credentials.txt
	1	+/* Credentials management - see Documentation/security/credentials.txt
2	2	*
3	3	* Copyright (C) 2008 Red Hat, Inc. All Rights Reserved.
4	4	* Written by David Howells (dhowells@redhat.com)

include/linux/key.h+1−1

@@ -9,7 +9,7 @@ · 8 unmodified lines
9	9	* 2 of the License, or (at your option) any later version.
10	10	*
11	11	*
12		− * See Documentation/keys.txt for information on keys/keyrings.
	12	+ * See Documentation/security/keys.txt for information on keys/keyrings.
13	13	*/
14	14
15	15	#ifndef _LINUX_KEY_H

kernel/cred.c+1−1

@@ -1,4 +1,4 @@
1		−/* Task credentials management - see Documentation/credentials.txt
	1	+/* Task credentials management - see Documentation/security/credentials.txt
2	2	*
3	3	* Copyright (C) 2008 Red Hat, Inc. All Rights Reserved.
4	4	* Written by David Howells (dhowells@redhat.com)

scripts/selinux/README+1−1

@@ -1,2 +1,2 @@
1		−Please see Documentation/SELinux.txt for information on
	1	+Please see Documentation/security/SELinux.txt for information on
2	2	installing a dummy SELinux policy.

security/apparmor/match.c+1−1

@@ -194,7 +194,7 @@ void aa_dfa_free_kref(struct kref *kref) · 193 unmodified lines
194	194	* @flags: flags controlling what type of accept tables are acceptable
195	195	*
196	196	* Unpack a dfa that has been serialized. To find information on the dfa
197		− * format look in Documentation/apparmor.txt
	197	+ * format look in Documentation/security/apparmor.txt
198	198	* Assumes the dfa @blob stream has been aligned on a 8 byte boundary
199	199	*
200	200	* Returns: an unpacked dfa ready for matching or ERR_PTR on failure

security/apparmor/policy_unpack.c+2−2

@@ -12,8 +12,8 @@ · 11 unmodified lines
12	12	* published by the Free Software Foundation, version 2 of the
13	13	* License.
14	14	*
15		− * AppArmor uses a serialized binary format for loading policy.
16		− * To find policy format documentation look in Documentation/apparmor.txt
	15	+ * AppArmor uses a serialized binary format for loading policy. To find
	16	+ * policy format documentation look in Documentation/security/apparmor.txt
17	17	* All policy is validated before it is used.
18	18	*/
19	19

security/keys/encrypted.c+1−1

@@ -8,7 +8,7 @@ · 7 unmodified lines
8	8	* it under the terms of the GNU General Public License as published by
9	9	* the Free Software Foundation, version 2 of the License.
10	10	*
11		− * See Documentation/keys-trusted-encrypted.txt
	11	+ * See Documentation/security/keys-trusted-encrypted.txt
12	12	*/
13	13
14	14	#include <linux/uaccess.h>

security/keys/request_key.c+1−1

@@ -8,7 +8,7 @@ · 7 unmodified lines
8	8	* as published by the Free Software Foundation; either version
9	9	* 2 of the License, or (at your option) any later version.
10	10	*
11		− * See Documentation/keys-request-key.txt
	11	+ * See Documentation/security/keys-request-key.txt
12	12	*/
13	13
14	14	#include <linux/module.h>

security/keys/request_key_auth.c+1−1

@@ -8,7 +8,7 @@ · 7 unmodified lines
8	8	* as published by the Free Software Foundation; either version
9	9	* 2 of the License, or (at your option) any later version.
10	10	*
11		− * See Documentation/keys-request-key.txt
	11	+ * See Documentation/security/keys-request-key.txt
12	12	*/
13	13
14	14	#include <linux/module.h>

security/keys/trusted.c+1−1

@@ -8,7 +8,7 @@ · 7 unmodified lines
8	8	* it under the terms of the GNU General Public License as published by
9	9	* the Free Software Foundation, version 2 of the License.
10	10	*
11		− * See Documentation/keys-trusted-encrypted.txt
	11	+ * See Documentation/security/keys-trusted-encrypted.txt
12	12	*/
13	13
14	14	#include <linux/uaccess.h>