summaryrefslogtreecommitdiff
path: root/security/keys/proc.c
diff options
context:
space:
mode:
authorJames Morris <james.l.morris@oracle.com>2016-11-14 09:34:01 +1100
committerJames Morris <james.l.morris@oracle.com>2016-11-14 09:34:01 +1100
commit185c0f26c0267d5978b5c30d3a04f90cb245cd76 (patch)
tree4b1324c9445bbcff095fb3ce755ec46d315bda5a /security/keys/proc.c
parenteafb7b9d01a7001ff8e9624e7dcb706844f981b3 (diff)
parenta25f0944ba9b1d8a6813fd6f1a86f1bd59ac25a6 (diff)
Merge commit 'v4.9-rc5' into next
Diffstat (limited to 'security/keys/proc.c')
-rw-r--r--security/keys/proc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/security/keys/proc.c b/security/keys/proc.c
index f0611a6368cd..b9f531c9e4fa 100644
--- a/security/keys/proc.c
+++ b/security/keys/proc.c
@@ -181,7 +181,7 @@ static int proc_keys_show(struct seq_file *m, void *v)
struct timespec now;
unsigned long timo;
key_ref_t key_ref, skey_ref;
- char xbuf[12];
+ char xbuf[16];
int rc;
struct keyring_search_context ctx = {