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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 84EFAC3A5A8 for ; Wed, 4 Sep 2019 18:20:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6213820882 for ; Wed, 4 Sep 2019 18:20:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567621220; bh=WK2wFAtlSHEEP0K9IUFvmPukBhdxwgGix6tED6IaHXE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=GtDAIvebOAQJU8mw3FMFGOsweC/4yjVt1lfxfRb80x4z/Jj1mhA27pp79uqspuQYU 2MnPGFdyzFimIAkhr7m0ZzJMvcrNLEjYcRV/JkhQa0g0eIkKL1SvV4s7W2FlxJsqPJ c5EkrCHAjYbweiQ7puXp5FDEL6FlV3wSK11lSU8k= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389753AbfIDSIR (ORCPT ); Wed, 4 Sep 2019 14:08:17 -0400 Received: from mail.kernel.org ([198.145.29.99]:51134 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389749AbfIDSIR (ORCPT ); Wed, 4 Sep 2019 14:08: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 4A2CB208E4; Wed, 4 Sep 2019 18:08:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567620496; bh=WK2wFAtlSHEEP0K9IUFvmPukBhdxwgGix6tED6IaHXE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ue5sqTNfaCX8F4Sd8qsV2xIgwYOxAgSokG8ndGzRWDxK7wkBR3gcZZHudICb4gZAC nB+on9JkcZayC6gClXJVGpXUMUPbMhkV162byJP1KD5dyHZE1/qrvdunifRCZTBVm+ KmLgDWpUgnnIRQithrQCbFOKip6JrdGl1R0qPi6E= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Gary R Hook , Herbert Xu Subject: [PATCH 4.19 79/93] crypto: ccp - Ignore unconfigured CCP device on suspend/resume Date: Wed, 4 Sep 2019 19:54:21 +0200 Message-Id: <20190904175309.912343198@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190904175302.845828956@linuxfoundation.org> References: <20190904175302.845828956@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 From: Gary R Hook commit 5871cd93692c8071fb9358daccb715b5081316ac upstream. If a CCP is unconfigured (e.g. there are no available queues) then there will be no data structures allocated for the device. Thus, we must check for validity of a pointer before trying to access structure members. Fixes: 720419f01832f ("crypto: ccp - Introduce the AMD Secure Processor device") Cc: Signed-off-by: Gary R Hook Signed-off-by: Herbert Xu Signed-off-by: Greg Kroah-Hartman --- drivers/crypto/ccp/ccp-dev.c | 8 ++++++++ 1 file changed, 8 insertions(+) --- a/drivers/crypto/ccp/ccp-dev.c +++ b/drivers/crypto/ccp/ccp-dev.c @@ -543,6 +543,10 @@ int ccp_dev_suspend(struct sp_device *sp unsigned long flags; unsigned int i; + /* If there's no device there's nothing to do */ + if (!ccp) + return 0; + spin_lock_irqsave(&ccp->cmd_lock, flags); ccp->suspending = 1; @@ -567,6 +571,10 @@ int ccp_dev_resume(struct sp_device *sp) unsigned long flags; unsigned int i; + /* If there's no device there's nothing to do */ + if (!ccp) + return 0; + spin_lock_irqsave(&ccp->cmd_lock, flags); ccp->suspending = 0;