#ifndef __ENCRYPTED_KEY_H #define __ENCRYPTED_KEY_H #define ENCRYPTED_DEBUG 0 #if defined(CONFIG_TRUSTED_KEYS) || \ (defined(CONFIG_TRUSTED_KEYS_MODULE) && defined(CONFIG_ENCRYPTED_KEYS_MODULE)) extern struct key *request_trusted_key(const char *trusted_desc, const u8 **master_key, size_t *master_keylen); #else static inline struct key *request_trusted_key(const char *trusted_desc, const u8 **master_key, size_t *master_keylen) { return ERR_PTR(-EOPNOTSUPP); } #endif #if ENCRYPTED_DEBUG static inline void dump_master_key(const u8 *master_key, size_t master_keylen) { print_hex_dump(KERN_ERR, "master key: ", DUMP_PREFIX_NONE, 32, 1, master_key, master_keylen, 0); } static inline void dump_decrypted_data(struct encrypted_key_payload *epayload) { print_hex_dump(KERN_ERR, "decrypted data: ", DUMP_PREFIX_NONE, 32, 1, epayload->decrypted_data, epayload->decrypted_datalen, 0); } static inline void dump_encrypted_data(struct encrypted_key_payload *epayload, unsigned int encrypted_datalen) { print_hex_dump(KERN_ERR, "encrypted data: ", DUMP_PREFIX_NONE, 32, 1, epayload->encrypted_data, encrypted_datalen, 0); } static inline void dump_hmac(const char *str, const u8 *digest, unsigned int hmac_size) { if (str) pr_info("encrypted_key: %s", str); print_hex_dump(KERN_ERR, "hmac: ", DUMP_PREFIX_NONE, 32, 1, digest, hmac_size, 0); } #else static inline void dump_master_key(const u8 *master_key, size_t master_keylen) { } static inline void dump_decrypted_data(struct encrypted_key_payload *epayload) { } static inline void dump_encrypted_data(struct encrypted_key_payload *epayload, unsigned int encrypted_datalen) { } static inline void dump_hmac(const char *str, const u8 *digest, unsigned int hmac_size) { } #endif #endif >commitdiff
path: root/net/bridge/br_sysfs_br.c
diff options
context:
space:
mode:
authorMarc Zyngier <marc.zyngier@arm.com>2017-01-17 14:21:56 +0000
committerBjorn Helgaas <bhelgaas@google.com>2017-01-17 08:41:51 -0600
commit4d191b1b63c209e37bf27938ef365244d3c41084 (patch)
treef2ab6cdb65ddacdf2e7c019cd55e353f0c16b400 /net/bridge/br_sysfs_br.c
parent51ebfc92b72b4f7dac1ab45683bf56741e454b8c (diff)
PCI/MSI: pci-xgene-msi: Fix CPU hotplug registration handling
The conversion to the new hotplug state machine introduced a regression where a successful hotplug registration would be treated as an error, effectively disabling the MSI driver forever. Fix it by doing the proper check on the return value. Fixes: 9c248f8896e6 ("PCI/xgene-msi: Convert to hotplug state machine") Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Acked-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Tested-by: Duc Dang <dhdang@apm.com> CC: Thomas Gleixner <tglx@linutronix.de> CC: stable@vger.kernel.org
Diffstat (limited to 'net/bridge/br_sysfs_br.c')