summaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2016-06-14 10:29:44 +0100
committerDavid Howells <dhowells@redhat.com>2016-06-14 10:29:44 +0100
commit965475acca2cbcc1d748a8b6a05f8c7cf57d075a (patch)
tree773e1e16dd91ee926d6b8dd7914e90814841e360 /security
parent40d273782ff16fe1a7445cc05c66a447dfea3433 (diff)
downloadlinux-965475acca2cbcc1d748a8b6a05f8c7cf57d075a.tar.gz
linux-965475acca2cbcc1d748a8b6a05f8c7cf57d075a.tar.bz2
linux-965475acca2cbcc1d748a8b6a05f8c7cf57d075a.zip
KEYS: Strip trailing spaces
Strip some trailing spaces. Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'security')
-rw-r--r--security/keys/persistent.c2
-rw-r--r--security/keys/request_key.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/security/keys/persistent.c b/security/keys/persistent.c
index 2ef45b319dd9..1edc1f0a0ce2 100644
--- a/security/keys/persistent.c
+++ b/security/keys/persistent.c
@@ -114,7 +114,7 @@ found:
ret = key_link(key_ref_to_ptr(dest_ref), persistent);
if (ret == 0) {
key_set_timeout(persistent, persistent_keyring_expiry);
- ret = persistent->serial;
+ ret = persistent->serial;
}
}
diff --git a/security/keys/request_key.c b/security/keys/request_key.c
index a29e3554751e..43affcf10b22 100644
--- a/security/keys/request_key.c
+++ b/security/keys/request_key.c
@@ -442,7 +442,7 @@ static struct key *construct_key_and_link(struct keyring_search_context *ctx,
if (ctx->index_key.type == &key_type_keyring)
return ERR_PTR(-EPERM);
-
+
user = key_user_lookup(current_fsuid());
if (!user)
return ERR_PTR(-ENOMEM);