queue-4.14/s390-pkey-add-one-more-argument-space-for-debug-feat.patch

   1 From 776e5b9ac8418670ef1d669bae7ca9f290a5c1ba Mon Sep 17 00:00:00 2001
   2 From: Harald Freudenberger <freude@linux.ibm.com>
   3 Date: Fri, 12 Apr 2019 11:04:50 +0200
   4 Subject: s390/pkey: add one more argument space for debug feature entry
   5
   6 [ Upstream commit 6b1f16ba730d4c0cda1247568c3a1bf4fa3a2f2f ]
   7
   8 The debug feature entries have been used with up to 5 arguents
   9 (including the pointer to the format string) but there was only
  10 space reserved for 4 arguemnts. So now the registration does
  11 reserve space for 5 times a long value.
  12
  13 This fixes a sometime appearing weired value as the last
  14 value of an debug feature entry like this:
  15
  16 ... pkey_sec2protkey zcrypt_send_cprb (cardnr=10 domain=12)
  17    failed with errno -2143346254
  18
  19 Signed-off-by: Harald Freudenberger <freude@linux.ibm.com>
  20 Reported-by: Christian Rund <Christian.Rund@de.ibm.com>
  21 Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
  22 Signed-off-by: Sasha Levin <sashal@kernel.org>
  23 ---
  24  drivers/s390/crypto/pkey_api.c | 3 ++-
  25  1 file changed, 2 insertions(+), 1 deletion(-)
  26
  27 diff --git a/drivers/s390/crypto/pkey_api.c b/drivers/s390/crypto/pkey_api.c
  28 index f61fa47135a6c..bd0376dc7e1e3 100644
  29 --- a/drivers/s390/crypto/pkey_api.c
  30 +++ b/drivers/s390/crypto/pkey_api.c
  31 @@ -49,7 +49,8 @@ static debug_info_t *debug_info;
  32
  33  static void __init pkey_debug_init(void)
  34  {
  35 -       debug_info = debug_register("pkey", 1, 1, 4 * sizeof(long));
  36 +       /* 5 arguments per dbf entry (including the format string ptr) */
  37 +       debug_info = debug_register("pkey", 1, 1, 5 * sizeof(long));
  38         debug_register_view(debug_info, &debug_sprintf_view);
  39         debug_set_level(debug_info, 3);
  40  }
  41 --
  42 2.20.1
  43