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=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 B83B9C04E53 for ; Wed, 15 May 2019 11:43:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8B82D2089E for ; Wed, 15 May 2019 11:43:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557920585; bh=CtEvnSd2nG5iRuhN/TSb86nmcmFmzPZaO4SzsCdw7A0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Lnc0pGNPWui2qrPJmug6HLvg+O9b1YI/AqoMhpQU8rJ9H7prcbZ5kgUY9j+QI5QEu qSperkVk0oZAU3pJoygjPv4I2Ii8CCFlbPrmiN/I32UC9jIRBc4kOswD2RRDS9rECq 83GKZT8PqYawAx7knKJX2hcJHcZnFgvf9gAuPfyA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732102AbfEOL1m (ORCPT ); Wed, 15 May 2019 07:27:42 -0400 Received: from mail.kernel.org ([198.145.29.99]:38558 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731887AbfEOL1k (ORCPT ); Wed, 15 May 2019 07:27:40 -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 5503F20818; Wed, 15 May 2019 11:27:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557919659; bh=CtEvnSd2nG5iRuhN/TSb86nmcmFmzPZaO4SzsCdw7A0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sthSIuDtmZvzDNMQKtjkiBhb5IKWA2OkPuXCtzeOO0+3nThtcjlny5Y+/Wi648u+e Ego7huj0DVhKDbJqnQX8pJAA5yxSCoHlCxGd2+pVfbBwK+ClO6hVaV/9cji5AT+2Bg 5HCugZ4/fcecXIh8F10Nryplon+tEjcPHfHjgDr8= 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 5.0 046/137] s390/pkey: add one more argument space for debug feature entry Date: Wed, 15 May 2019 12:55:27 +0200 Message-Id: <20190515090656.791861565@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190515090651.633556783@linuxfoundation.org> References: <20190515090651.633556783@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 2f92bbed4bf68..097e890e0d6d9 100644 --- a/drivers/s390/crypto/pkey_api.c +++ b/drivers/s390/crypto/pkey_api.c @@ -51,7 +51,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