On Wed, Aug 15, 2012 at 2:43 PM, Dmitry Kasatkin <dmitry.kasat...@intel.com> wrote: > From: Mimi Zohar <zo...@linux.vnet.ibm.com> > > In order to create the integrity keyrings (eg. _evm, _ima, _modules), > root's uid and session keyrings need to be initialized early. > > Signed-off-by: Mimi Zohar <zo...@us.ibm.com> > --- > security/keys/Makefile | 1 + > security/keys/root_keyring.c | 18 ++++++++++++++++++ > 2 files changed, 19 insertions(+) > create mode 100644 security/keys/root_keyring.c > > diff --git a/security/keys/Makefile b/security/keys/Makefile > index 504aaa0..c93ce8d 100644 > --- a/security/keys/Makefile > +++ b/security/keys/Makefile > @@ -18,6 +18,7 @@ obj-y := \ > obj-$(CONFIG_KEYS_COMPAT) += compat.o > obj-$(CONFIG_PROC_FS) += proc.o > obj-$(CONFIG_SYSCTL) += sysctl.o > +obj-$(CONFIG_INTEGRITY_SIGNATURE) += root_keyring.o > > # > # Key types > diff --git a/security/keys/root_keyring.c b/security/keys/root_keyring.c > new file mode 100644 > index 0000000..f6662eb > --- /dev/null > +++ b/security/keys/root_keyring.c > @@ -0,0 +1,18 @@ > +/* > + * Copyright (C) 2012 IBM Corporation > + * > + * Author: > + * Mimi Zohar <zo...@us.ibm.com> > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License as published by > + * the Free Software Foundation, version 2 of the License. > + */ > + > +#include "internal.h" > +static int __init init_root_keyring(void) > +{ > + return install_user_keyrings(); > +} > + > +late_initcall(init_root_keyring); > --
Why is this in an entirely new file instead of just being added to process_keys.c ? josh -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/