summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorAlex Shi <alex.shi@linaro.org>2016-11-11 12:01:04 +0800
committerAlex Shi <alex.shi@linaro.org>2016-11-11 12:01:04 +0800
commit17d454ca330f6da6417be55a4c34a01dd6b55bdf (patch)
tree5a9129320cb326b2ce0fdadc5756946d50954734 /security
parentecad39540a66997b642907e2f939a9f662471a9f (diff)
parentbeb996c1c39990c22248d3afdc23d7d2af13272f (diff)
Merge tag 'v4.4.31' into linux-linaro-lsk-v4.4
This is the 4.4.31 stable release
Diffstat (limited to 'security')
-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 = {