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.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS, T_DKIMWL_WL_HIGH,USER_AGENT_GIT autolearn=unavailable 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 3E45EC04AAB for ; Tue, 7 May 2019 05:53:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 05AFE2054F for ; Tue, 7 May 2019 05:53:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557208413; bh=M9+lZ3D4y2h/UNEc0bB4GulpxOuPcqh6SNi4x/szEto=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=BS3zULhv8faPfz/hHUbdtWk5oIaId7iCnbhswFqoVD1aMKHYzG5GHLrirGbciw2qy aLUrjzkHQVnoQf/BoxEMvs5bwu0Ppc31qIO6H86okQ9MNCPweMJvXI3LJmXhzURU2b tffotd4FHbfQe2fPyARTLS4qdoSlHaf9m/7tiEvw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728769AbfEGFi5 (ORCPT ); Tue, 7 May 2019 01:38:57 -0400 Received: from mail.kernel.org ([198.145.29.99]:58602 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727853AbfEGFi4 (ORCPT ); Tue, 7 May 2019 01:38:56 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E9F6620B7C; Tue, 7 May 2019 05:38:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557207535; bh=M9+lZ3D4y2h/UNEc0bB4GulpxOuPcqh6SNi4x/szEto=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vLQpS8e1e064JoDqRSpTkf0ERUBG65ShGaC5I50HLJfuVovuvDebNvA6XTE6ytxfl bkiSYy8/DQtNIJ2dlWNiQSYMe9/iG0j3jrbJJgyLdTRgjabtVFAo2YcpJC+CYdz7oR SyUn8Dp77nR9QBOtPaVHV6cPJQ8I9qGsO128qVNU= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Harald Freudenberger , Christian Rund , Martin Schwidefsky , Sasha Levin , linux-s390@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 16/95] s390/pkey: add one more argument space for debug feature entry Date: Tue, 7 May 2019 01:37:05 -0400 Message-Id: <20190507053826.31622-16-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190507053826.31622-1-sashal@kernel.org> References: <20190507053826.31622-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Harald Freudenberger [ 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 f61fa47135a6..bd0376dc7e1e 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