From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 50A7DC04E53 for ; Wed, 15 May 2019 11:16:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 103012084E for ; Wed, 15 May 2019 11:16:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557918980; bh=pVBVLh20Pc7GiGl5VXRw7hLGQlU0e4RrX6Aj/99BoY8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=hCrb+BlIHRgpaVxSlJLm8TBYTCwFw7KwnLApLHyfx0zAOSXedMVQVI2TFKAJ5LkDq h22Oc/khW5ZALzVAVG/MzLSHhDv3LFNlTbRnh/NzuGpIj19zKwCxDOwoinycc+qPl9 gOiEjFIOX9gk6oxbTSgNbliFXNec6MMQ/k9bMVD4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730468AbfEOLQS (ORCPT ); Wed, 15 May 2019 07:16:18 -0400 Received: from mail.kernel.org ([198.145.29.99]:53044 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730463AbfEOLQR (ORCPT ); Wed, 15 May 2019 07:16:17 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id BB8A620843; Wed, 15 May 2019 11:16:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557918977; bh=pVBVLh20Pc7GiGl5VXRw7hLGQlU0e4RrX6Aj/99BoY8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BLIAcLs9s4Xwm9Ag/39xNDbtc2/BeVNkAtD+LQlRZdqWaHTAcuTn9RONWNEHhK5OQ Lmkf6h8LpEdnYUXxWJTTFLAlO21ujSrB4y0XNkupLmt1w5SCHVk6RWA3G5Q7wyuQhS rjM78Se1INGQsUcCHKUF9L0TbW4UnGtuZBvdEhuo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Harald Freudenberger , Christian Rund , Martin Schwidefsky , Sasha Levin Subject: [PATCH 4.14 021/115] s390/pkey: add one more argument space for debug feature entry Date: Wed, 15 May 2019 12:55:01 +0200 Message-Id: <20190515090700.825336863@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190515090659.123121100@linuxfoundation.org> References: <20190515090659.123121100@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org [ Upstream commit 6b1f16ba730d4c0cda1247568c3a1bf4fa3a2f2f ] The debug feature entries have been used with up to 5 arguents (including the pointer to the format string) but there was only space reserved for 4 arguemnts. So now the registration does reserve space for 5 times a long value. This fixes a sometime appearing weired value as the last value of an debug feature entry like this: ... pkey_sec2protkey zcrypt_send_cprb (cardnr=10 domain=12) failed with errno -2143346254 Signed-off-by: Harald Freudenberger Reported-by: Christian Rund Signed-off-by: Martin Schwidefsky Signed-off-by: Sasha Levin --- drivers/s390/crypto/pkey_api.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/s390/crypto/pkey_api.c b/drivers/s390/crypto/pkey_api.c index f61fa47135a6c..bd0376dc7e1e3 100644 --- a/drivers/s390/crypto/pkey_api.c +++ b/drivers/s390/crypto/pkey_api.c @@ -49,7 +49,8 @@ static debug_info_t *debug_info; static void __init pkey_debug_init(void) { - debug_info = debug_register("pkey", 1, 1, 4 * sizeof(long)); + /* 5 arguments per dbf entry (including the format string ptr) */ + debug_info = debug_register("pkey", 1, 1, 5 * sizeof(long)); debug_register_view(debug_info, &debug_sprintf_view); debug_set_level(debug_info, 3); } -- 2.20.1