/* * ecryptfs_format.c: helper functions for the encrypted key type * * Copyright (C) 2006 International Business Machines Corp. * Copyright (C) 2010 Politecnico di Torino, Italy * TORSEC group -- http://security.polito.it * * Authors: * Michael A. Halcrow * Tyler Hicks * Roberto Sassu * * 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 #include "ecryptfs_format.h" u8 *ecryptfs_get_auth_tok_key(struct ecryptfs_auth_tok *auth_tok) { return auth_tok->token.password.session_key_encryption_key; } EXPORT_SYMBOL(ecryptfs_get_auth_tok_key); /* * ecryptfs_get_versions() * * Source code taken from the software 'ecryptfs-utils' version 83. * */ void ecryptfs_get_versions(int *major, int *minor, int *file_version) { *major = ECRYPTFS_VERSION_MAJOR; *minor = ECRYPTFS_VERSION_MINOR; if (file_version) *file_version = ECRYPTFS_SUPPORTED_FILE_VERSION; } EXPORT_SYMBOL(ecryptfs_get_versions); /* * ecryptfs_fill_auth_tok - fill the ecryptfs_auth_tok structure * * Fill the ecryptfs_auth_tok structure with required ecryptfs data. * The source code is inspired to the original function generate_payload() * shipped with the software 'ecryptfs-utils' version 83. * */ int ecryptfs_fill_auth_tok(struct ecryptfs_auth_tok *auth_tok, const char *key_desc) { int major, minor; ecryptfs_get_versions(&major, &minor, NULL); auth_tok->version = (((uint16_t)(major << 8) & 0xFF00) | ((uint16_t)minor & 0x00FF)); auth_tok->token_type = ECRYPTFS_PASSWORD; strncpy((char *)auth_tok->token.password.signature, key_desc, ECRYPTFS_PASSWORD_SIG_SIZE); auth_tok->token.password.session_key_encryption_key_bytes = ECRYPTFS_MAX_KEY_BYTES; /* * Removed auth_tok->token.password.salt and * auth_tok->token.password.session_key_encryption_key * initialization from the original code */ /* TODO: Make the hash parameterizable via policy */ auth_tok->token.password.flags |= ECRYPTFS_SESSION_KEY_ENCRYPTION_KEY_SET; /* The kernel code will encrypt the session key. */ auth_tok->session_key.encrypted_key[0] = 0; auth_tok->session_key.encrypted_key_size = 0; /* Default; subject to change by kernel eCryptfs */ auth_tok->token.password.hash_algo = PGP_DIGEST_ALGO_SHA512; auth_tok->token.password.flags &= ~(ECRYPTFS_PERSISTENT_PASSWORD); return 0; } EXPORT_SYMBOL(ecryptfs_fill_auth_tok); MODULE_LICENSE("GPL"); value='author'>author
path: root/drivers/usb/class/Makefile
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2017-01-31 09:37:34 +0100
committerThomas Gleixner <tglx@linutronix.de>2017-01-31 21:47:58 +0100
commit0becc0ae5b42828785b589f686725ff5bc3b9b25 (patch)
treebe6d0e1f37c38ed0a7dd5da2d4b1e93f0fb43101 /drivers/usb/class/Makefile
parent24c2503255d35c269b67162c397a1a1c1e02f6ce (diff)
x86/mce: Make timer handling more robust
Erik reported that on a preproduction hardware a CMCI storm triggers the BUG_ON in add_timer_on(). The reason is that the per CPU MCE timer is started by the CMCI logic before the MCE CPU hotplug callback starts the timer with add_timer_on(). So the timer is already queued which triggers the BUG. Using add_timer_on() is pretty pointless in this code because the timer is strictlty per CPU, initialized as pinned and all operations which arm the timer happen on the CPU to which the timer belongs. Simplify the whole machinery by using mod_timer() instead of add_timer_on() which avoids the problem because mod_timer() can handle already queued timers. Use __start_timer() everywhere so the earliest armed expiry time is preserved. Reported-by: Erik Veijola <erik.veijola@intel.com> Tested-by: Borislav Petkov <bp@alien8.de> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Reviewed-by: Borislav Petkov <bp@alien8.de> Cc: Tony Luck <tony.luck@intel.com> Link: http://lkml.kernel.org/r/alpine.DEB.2.20.1701310936080.3457@nanos Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'drivers/usb/class/Makefile')