From patchwork Tue Jun 16 15:35:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 188059 Delivered-To: patch@linaro.org Received: by 2002:a92:cf06:0:0:0:0:0 with SMTP id c6csp3768361ilo; Tue, 16 Jun 2020 08:48:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy/aGVsocWX+/gyhXqLhPM645xUszS+jCjQq1xK1l+Yieydp3ZDW6ZqihWhlQkGlruZ89C6 X-Received: by 2002:a17:906:5e05:: with SMTP id n5mr3354250eju.278.1592322528047; Tue, 16 Jun 2020 08:48:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592322528; cv=none; d=google.com; s=arc-20160816; b=QikAk7amT6iywKE6WI1trupzZWj2kOtchjLl7lTIjHcX61ylkuHCraJET+gB+Coe9w iZUXzTyuEO3WXADKUt7CvWSGu7AEWbJx2R9p0ZjDxRMQir317yxoOlFX5hr+2LsVEwnE VWUFd1uy17bO4P/vT3IKwWl/TZWZNuhHo/jmMi8kRP730jGZQqcPFuoA+9jpOLerz/LI vRq/xQjRr5yt8XrL3NjNg/sDhZO8t95IGvrj0V90Pzu00GWEeSzpdiTr5vsLzSN4UmF6 kNL06DWbpCE2nu0mdhCYHu0Shjg32c8GBVGsrkbfaAM0r77WbkGZ9Ig2effa3+cr6g0/ Edew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=AmRCjRMKV9CpHN/C0t/k/XJH1ifINOw6N3zAZ6GLULY=; b=PVm7fbMPp+RchqlnqNWqa8TacCjy8OABWUU9jJH6iIhR379awvsFUUHPFdG0cTXCSs cVzmQUFO7XMl2tfnfsEP+GrzV1aMSKeuKbjuHGOVc+NsGbFM7OMXpxDVyC3R56MSMNLT 7Qb+lONvWFDpC7dRq7qh9UQ3lh64OW6XnOIr6I/p2Hlvmotl0LP0mo1K5nWCtRVgm0as UNtQjZSbBdOTUR7CnEfaHKoc6ipY0Of98BP9kpe0oCz508lWSi7KPcLihCjgfKfHiSo/ GKGeb/EX3rO+t5Altjs62Cd0A/mqSBmcrimksQcWxAR7GCqAaZomdT726X/RF6Xdpg7E kvPA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=eTLxy8Oa; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id l5si10156903edw.412.2020.06.16.08.48.47; Tue, 16 Jun 2020 08:48:48 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=eTLxy8Oa; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732446AbgFPPsp (ORCPT + 15 others); Tue, 16 Jun 2020 11:48:45 -0400 Received: from mail.kernel.org ([198.145.29.99]:43362 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731406AbgFPPso (ORCPT ); Tue, 16 Jun 2020 11:48:44 -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 B28D02071A; Tue, 16 Jun 2020 15:48:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592322524; bh=REfJ7+ONixLxyVEXno+zYpwYGwcixL3r/XPDzbPOx0Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eTLxy8OagvzKwO0lgfl2O+G6OjVGprU3T48CZX+uY/tKE7c4jibFZejY9TwnNrDz+ gT7Ab/h6aD3Lpk8d9yPSBjExn28c1ZdVTpQxJBi0uzGkpu4JKMWgK9zwWZUTdpWxXs Nw0zhfUhJQdjfOH6AVpK5fEQr0Mz3fCrxk2komsg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ulf Hansson Subject: [PATCH 5.7 156/163] mmc: sdio: Fix potential NULL pointer error in mmc_sdio_init_card() Date: Tue, 16 Jun 2020 17:35:30 +0200 Message-Id: <20200616153114.279678957@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200616153106.849127260@linuxfoundation.org> References: <20200616153106.849127260@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Ulf Hansson commit f04086c225da11ad16d7f9a2fbca6483ab16dded upstream. During some scenarios mmc_sdio_init_card() runs a retry path for the UHS-I specific initialization, which leads to removal of the previously allocated card. A new card is then re-allocated while retrying. However, in one of the corresponding error paths we may end up to remove an already removed card, which likely leads to a NULL pointer exception. So, let's fix this. Fixes: 5fc3d80ef496 ("mmc: sdio: don't use rocr to check if the card could support UHS mode") Cc: Signed-off-by: Ulf Hansson Link: https://lore.kernel.org/r/20200430091640.455-2-ulf.hansson@linaro.org Signed-off-by: Greg Kroah-Hartman --- drivers/mmc/core/sdio.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- a/drivers/mmc/core/sdio.c +++ b/drivers/mmc/core/sdio.c @@ -718,9 +718,8 @@ try_again: /* Retry init sequence, but without R4_18V_PRESENT. */ retries = 0; goto try_again; - } else { - goto remove; } + return err; } /*