Linus Torvalds 67e2c38838
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security ...
Pull security layer updates from James Morris:
"In terms of changes, there's general maintenance to the Smack,
SELinux, and integrity code.
The IMA code adds a new kconfig option, IMA_APPRAISE_SIGNED_INIT,
which allows IMA appraisal to require signatures. Support for reading
keys from rootfs before init is call is also added"
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (23 commits)
selinux: Remove security_ops extern
security: smack: fix out-of-bounds access in smk_parse_smack()
VFS: refactor vfs_read()
ima: require signature based appraisal
integrity: provide a hook to load keys when rootfs is ready
ima: load x509 certificate from the kernel
integrity: provide a function to load x509 certificate from the kernel
integrity: define a new function integrity_read_file()
Security: smack: replace kzalloc with kmem_cache for inode_smack
Smack: Lock mode for the floor and hat labels
ima: added support for new kernel cmdline parameter ima_template_fmt
ima: allocate field pointers array on demand in template_desc_init_fields()
ima: don't allocate a copy of template_fmt in template_desc_init_fields()
ima: display template format in meas. list if template name length is zero
ima: added error messages to template-related functions
ima: use atomic bit operations to protect policy update interface
ima: ignore empty and with whitespaces policy lines
ima: no need to allocate entry for comment
ima: report policy load status
ima: use path names cache
...
2014-12-14 20:36:37 -08:00
2014-12-14 16:43:47 -08:00
2014-11-11 16:31:11 -05:00
2014-08-06 18:01:23 -07:00
2014-12-07 21:22:09 +01:00
2014-10-14 12:57:02 -07:00
2014-11-13 09:26:33 -07:00
2014-08-08 15:57:26 -07:00
2014-10-15 20:31:05 +05:30
2014-09-22 16:48:47 +09:00
2014-12-14 14:05:05 -08:00
2014-12-14 14:57:16 -08:00
2014-11-15 16:04:56 +00:00
2014-08-07 23:37:07 -07:00
2014-11-24 07:45:15 +01:00
2014-11-24 17:24:08 -05:00
2014-12-11 13:20:50 -08:00
2014-12-11 14:47:36 -05:00
2014-12-08 20:45:54 -05:00
2014-12-08 09:11:04 +01:00
2014-10-21 13:46:03 -07:00
2014-09-15 22:20:21 +02:00
2014-11-22 13:58:39 +05:30
2014-09-04 19:21:45 +02:00
2014-12-14 14:57:16 -08:00
2014-10-28 03:30:21 +01:00
2014-12-05 11:14:43 +00:00
2014-09-24 11:53:39 -07:00
2014-11-24 18:53:42 +00:00
2014-11-27 13:14:52 -05:00
2014-12-14 14:57:16 -08:00
2014-08-07 14:40:09 -04:00
2014-12-08 20:00:44 +01:00
2014-09-16 16:28:34 -06:00
2014-08-16 08:35:34 -04:00
2014-08-23 13:05:08 -04:00
2014-10-27 14:16:19 -04:00
2014-09-08 10:54:03 +02:00
2014-11-10 12:40:48 +01:00
2014-08-13 10:31:57 +02:00
2014-11-19 13:01:26 -05:00
2014-09-08 10:00:43 -06:00
2014-10-09 22:26:01 -04:00
2014-12-13 12:42:51 -08:00
2014-11-24 08:04:44 -07:00
2014-12-14 16:10:09 -08:00
2014-11-16 09:55:39 +01:00
2014-10-14 09:00:44 -06:00
2014-12-13 14:14:23 -08:00
2014-12-13 14:14:23 -08:00
2014-11-13 16:17:06 -08:00
2014-12-05 21:47:32 -08:00
2014-10-01 22:12:48 -04:00
2014-09-04 22:04:42 -04:00
2014-11-07 11:45:00 -08:00
2014-09-24 14:23:34 +08:00
2014-12-11 18:57:19 -08:00
2014-09-27 12:52:33 -07:00
2014-11-17 11:13:52 -08:00
2014-10-15 07:05:03 +02:00
2014-10-22 16:14:03 -06:00
2014-10-27 13:00:55 +01:00
2014-09-29 14:36:26 -04:00
2014-12-10 17:41:06 -08:00
2014-12-13 12:42:51 -08:00
2014-10-28 11:03:40 +01:00
2014-10-28 11:03:40 +01:00
2014-11-26 19:28:11 -08:00
2014-11-07 11:45:00 -08:00
2014-10-21 00:51:01 +02:00
2014-11-29 23:38:38 +01:00
2014-11-12 21:17:27 +01:00
2014-11-07 11:45:00 -08:00
2014-10-27 11:15:27 -04:00
2014-10-22 16:14:04 -06:00
2014-09-27 09:14:59 -06:00
2014-11-24 22:43:57 +08:00
2014-11-19 13:01:20 -05:00
2014-12-14 16:10:09 -08:00
2014-09-23 22:53:15 -07:00
2014-11-19 11:24:59 -05:00
2014-12-14 16:10:09 -08:00
2014-08-06 18:01:16 -07:00
2014-08-26 07:39:13 +02:00
2014-12-05 20:55:27 +05:30
2014-11-18 11:18:35 +01:00
2014-11-10 09:27:30 -07:00
2014-10-03 14:55:48 -07:00
2014-09-29 00:04:55 -04:00
2014-10-20 14:22:22 +02:00
2014-11-25 15:42:53 +01:00
2014-11-05 09:03:16 +01:00
2014-11-24 07:45:02 +01:00
2014-12-08 20:47:41 -05:00
2014-12-08 21:07:10 -05:00
2014-11-04 17:34:15 -08:00
2014-12-13 12:42:52 -08:00
2014-11-03 11:53:34 -05:00
2014-12-10 17:41:10 -08:00
2014-12-05 21:47:32 -08:00
2014-09-08 09:51:30 +09:00
2014-10-09 11:35:48 +03:00
2014-11-04 07:17:46 +01:00
2014-10-08 16:01:41 -04:00
2014-08-07 14:40:08 -04:00
2014-12-14 20:36:37 -08:00
2014-09-03 18:02:55 -05:00
2014-10-15 21:31:27 +05:30
2014-12-13 12:42:53 -08:00
2014-11-19 15:25:39 -05:00
2014-11-21 14:42:10 -05:00
2014-10-09 22:25:52 -04:00
2014-10-14 17:03:53 -04:00
2014-12-13 12:42:48 -08:00
2014-08-06 18:01:24 -07:00
2014-11-04 21:58:23 +01:00
2014-10-28 17:30:59 +01:00
2014-12-10 15:17:46 -05:00
2014-12-12 11:15:33 +01:00
2014-08-06 18:01:22 -07:00
2014-10-09 22:25:57 -04:00
2014-12-10 17:41:04 -08:00
2014-12-11 17:48:14 -08:00
2014-12-08 20:24:11 -05:00
2014-12-14 12:54:40 -08:00
2014-11-19 18:45:16 +01:00
2014-11-17 09:49:17 +01:00
2014-12-02 20:01:23 -08:00
2014-09-29 15:37:01 -04:00
2014-11-21 14:20:17 -05:00
2014-09-04 22:26:14 -07:00
2014-09-09 10:28:43 -04:00
2014-11-14 17:08:58 -05:00
2014-12-09 21:21:34 -08:00
2014-11-17 23:12:01 -05:00
2014-12-12 15:15:41 -05:00
2014-11-07 10:09:07 -08:00
2014-12-02 13:07:13 +01:00
2014-09-04 14:41:43 -06:00
2014-09-23 23:13:13 -07:00
2014-12-13 12:42:52 -08:00
2014-12-11 15:04:11 -06:00
2014-12-11 15:04:06 -06:00
2014-11-05 16:59:04 -05:00
2014-09-13 18:38:15 +02:00
2014-12-10 09:01:01 -08:00
2014-10-09 16:07:43 -04:00
2014-11-23 13:01:46 +01:00
2014-11-23 13:01:46 +01:00
2014-09-18 00:58:12 -04:00
2014-09-12 13:59:03 -07:00
2014-08-10 09:00:16 +02:00
2014-12-10 17:41:11 -08:00
2014-11-16 10:04:18 +01:00
2014-12-14 15:23:32 -08:00
2014-10-14 15:05:34 -04:00
2014-11-07 10:53:25 -08:00
2014-10-14 02:18:21 +02:00
2014-09-16 17:36:08 +01:00
2014-09-09 10:34:56 +02:00
2014-10-22 16:14:04 -06:00
2014-10-29 16:33:14 -07:00
2014-08-06 18:01:24 -07:00
2014-12-13 12:42:47 -08:00
2014-10-27 13:27:27 +01:00
2014-11-26 14:40:45 +01:00
2014-08-29 16:35:53 +02:00
2014-11-04 21:58:25 +01:00
2014-12-11 18:52:37 -08:00
2014-11-20 14:45:15 +01:00
2014-10-13 15:51:40 +02:00
2014-11-27 12:50:59 +05:30
2014-10-08 10:39:41 +05:30
2014-10-24 15:49:20 -04:00
2014-11-30 16:40:11 +00:00
2014-09-29 11:56:02 -04:00
2014-08-06 18:01:15 -07:00
2014-12-13 12:42:49 -08:00
2014-10-09 22:25:52 -04:00
2014-10-22 16:14:04 -06:00
2014-10-09 22:25:56 -04:00
2014-11-21 14:08:56 -05:00
2014-10-09 22:26:01 -04:00
2014-12-13 12:42:48 -08:00
2014-12-13 12:42:48 -08:00
2014-10-09 22:25:58 -04:00
2014-12-13 12:42:45 -08:00
2014-12-13 12:42:48 -08:00
2014-10-29 14:31:17 +01:00
2014-10-14 02:18:28 +02:00
2014-10-24 00:14:36 +02:00
2014-11-23 17:14:43 +01:00
2014-08-13 10:32:03 +02:00
2014-11-05 23:52:33 -08:00
2014-12-09 16:10:06 -05:00
2014-09-26 18:42:31 +02:00
2014-08-25 10:45:28 +02:00
2014-11-25 16:38:32 -05:00
2014-11-25 16:38:32 -05:00
2014-11-24 17:00:42 -05:00
2014-08-22 18:04:43 -04:00
2014-11-25 16:38:32 -05:00
2014-10-25 08:07:30 +02:00
2014-10-14 02:18:27 +02:00
2014-08-06 18:01:21 -07:00
2014-11-04 13:18:52 -07:00
2014-11-04 16:43:08 +00:00
2014-11-12 07:49:38 -07:00
2014-11-04 13:29:38 +00:00
2014-11-24 22:25:06 +00:00
2014-10-29 16:33:14 -07:00
2014-12-11 13:06:58 -08:00
2014-09-18 09:53:25 -07:00
2014-11-20 12:11:25 -08:00
2014-11-27 12:51:04 +05:30
2014-12-13 12:42:49 -08:00
2014-12-10 17:41:05 -08:00
2014-12-13 12:42:48 -08:00
2014-12-13 12:42:48 -08:00
2014-08-06 18:01:17 -07:00
2014-11-13 16:17:05 -08:00
2014-10-09 22:26:01 -04:00
2014-11-13 10:35:25 -07:00
2014-12-14 14:57:16 -08:00
2014-11-05 13:06:16 -07:00
2014-12-11 18:15:33 -08:00
2014-09-08 09:51:29 +09:00
2014-12-13 12:42:53 -08:00
2014-12-11 18:36:26 -08:00
2014-11-21 11:19:15 -05:00
2014-11-16 11:42:04 +01:00
2014-10-07 13:06:45 -04:00
2014-11-21 14:08:55 -05:00
2014-10-08 10:39:33 +05:30
2014-11-06 15:16:02 -08:00
2014-11-20 14:45:15 +01:00
2014-11-07 01:46:51 +01:00
2014-12-08 20:00:44 +01:00
2014-11-29 23:53:20 +01:00
2014-12-04 00:46:58 +01:00
2014-12-12 15:26:48 -08:00
2014-12-08 20:00:44 +01:00
2014-10-19 20:22:32 +03:00
2014-10-28 03:30:19 +01:00
2014-12-10 20:35:41 -08:00
2014-09-17 16:33:11 -04:00
2014-11-04 21:58:23 +01:00
2014-09-08 09:51:30 +09:00
2014-12-11 13:38:31 -08:00
2014-12-10 17:41:10 -08:00
2014-11-26 18:07:45 +00:00
2014-10-28 16:48:02 -04:00
2014-11-10 10:06:08 +01:00
2014-11-10 10:06:07 +01:00
2014-08-24 18:36:01 -07:00
2014-12-13 12:42:52 -08:00
2014-10-14 02:18:21 +02:00
2014-12-12 10:08:06 -08:00
2014-11-20 08:57:58 +01:00
2014-11-03 19:20:34 -08:00
2014-11-03 19:20:43 -08:00
2014-09-26 00:00:06 -07:00
2014-11-19 10:28:14 +00:00
2014-10-20 10:11:29 +02:00
2014-10-20 10:11:29 +02:00
2014-11-13 15:18:40 -05:00
2014-11-10 16:45:43 -05:00
2014-08-08 15:57:24 -07:00
2014-10-09 22:25:57 -04:00
2014-11-21 12:00:00 -08:00
2014-12-09 13:36:57 -05:00
2014-08-13 10:32:03 +02:00
2014-08-08 15:57:26 -07:00
2014-12-13 12:42:51 -08:00
2014-10-09 22:26:04 -04:00
2014-09-03 14:58:17 -07:00
2014-10-12 10:13:55 -04:00
2014-11-19 22:01:19 -05:00
2014-10-29 20:26:06 -04:00
2014-09-19 12:35:16 +02:00
2014-08-28 11:59:38 +05:30
2014-11-06 14:59:21 -08:00
2014-11-06 14:57:24 -08:00
2014-11-25 17:06:40 -08:00
2014-08-08 15:57:26 -07:00
2014-08-08 15:57:31 -07:00
2014-12-13 12:42:48 -08:00
2014-10-14 02:18:20 +02:00
2014-12-10 13:31:57 -05:00
2014-10-09 22:25:51 -04:00
2014-12-13 12:42:49 -08:00
2014-09-19 12:35:15 +02:00
2014-12-10 22:41:55 -05:00
2014-08-13 10:32:38 +02:00
2014-11-26 19:33:57 -08:00
2014-12-13 12:42:48 -08:00
2014-10-14 02:18:26 +02:00
2014-10-24 12:33:32 -07:00
2014-09-30 21:06:07 +02:00
2014-12-10 17:41:09 -08:00
2014-12-13 12:42:47 -08:00
2014-12-13 12:42:51 -08:00
2014-08-08 15:57:24 -07:00
2014-11-07 10:53:25 -08:00
2014-11-17 10:28:04 -08:00
2014-09-27 09:14:59 -06:00
2014-12-10 13:17:23 -05:00
2014-10-10 14:02:25 +08:00
2014-09-26 08:15:29 +01:00
2014-10-14 03:47:00 +02:00
2014-11-21 11:59:58 -08:00
2014-10-29 15:15:40 +01:00
2014-12-10 10:13:28 -08:00
2014-10-09 22:25:51 -04:00
2014-09-16 13:41:06 -07:00
2014-11-19 22:01:15 -05:00
2014-08-06 13:03:43 +02:00
2014-09-10 10:48:46 -04:00
2014-09-23 21:19:35 -07:00
2014-11-06 14:57:27 -08:00
2014-09-01 21:36:28 -07:00
2014-11-07 10:09:07 -08:00
2014-12-09 16:29:11 -05:00
2014-10-22 16:14:04 -06:00
2014-09-23 21:40:48 -07:00
2014-12-04 00:51:54 +01:00
2014-08-08 15:57:22 -07:00
2014-11-28 16:08:16 +01:00
2014-08-08 10:39:16 -06:00
2014-09-18 19:21:20 -04:00
2014-09-16 15:02:55 -06:00
2014-12-09 12:05:24 +02:00
2014-12-09 16:32:32 +02:00
2014-12-09 21:42:00 +02:00
2014-12-13 12:42:48 -08:00
2014-08-06 18:01:19 -07:00
2014-12-09 16:28:23 -05:00
2014-11-04 07:17:45 +01:00
2014-10-20 20:46:25 +02:00
2014-09-13 05:13:08 +09:00
2014-08-06 18:01:23 -07:00
2014-08-08 15:57:26 -07:00
2014-08-06 18:01:23 -07:00
2014-10-09 22:26:02 -04:00
67e2c38838