From patchwork Tue Jun 16 15:35:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 188053 Delivered-To: patch@linaro.org Received: by 2002:a92:cf06:0:0:0:0:0 with SMTP id c6csp3762652ilo; Tue, 16 Jun 2020 08:41:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzUtcjI2uhQIHOzUIyZoRv+g5H5hJUqXJ5KkKn1PDPqLYBz1dXaD3jNeqrTalFfNwCUhIFc X-Received: by 2002:a17:907:216c:: with SMTP id rl12mr3572381ejb.156.1592322088680; Tue, 16 Jun 2020 08:41:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592322088; cv=none; d=google.com; s=arc-20160816; b=Kr0L+xsHXSWks2QsesnRzarlBioFvcKx/aCGIs7ZgVSfJa2Hd2JovCXCGsFjXW9H5W 53YD63sJjoVoTenq9e9cfsr0t7+IOQCYgdTyMBUOxBPguG1hBH1cNMzKJ0vVewXp1A7h 2Xn9d567PWDm1Vcsxv+vS13g+J7dLQNMRJogrKhzU6jhHRNcqsTQ0feEXQ38O20f9KEo 1akRvTJ72K2p4citqIbNVGMZs2K9S/eStLQsZ+ANoUxdtkXgtgTS2MvgYEEPzYJImc+5 4GvfBovQe7whhyMEAh1sN7sK4thwtdbwXO8Nb9+Ow0OwYsOxaZVS64MdrvAAzpzyXwM2 YkHg== 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=Vopcm/wyAoQlAGJacxQEm6oxzE6ycUsN/RHp9qnRmEx/6wJdfCSxerQ1/b9fPbc6PL ef3qnk2kLVh5VZ1EnXnJsviIxQWDlUVtUHHwCn/pmspO5xKoL93wwhGvNFsSEpr/silE IB860HlBPvJpThmxIYge/R+TAy9syb8wxJ6eHLM1DQgCg9kftk5HBtJf3ZGkOCVm8mxH PMUc59i0FNpJrWk/AIrCeR0L9C3xjdJXT4EBY1AB68UTQNB0SXypEm5rlobCSZQgxxH/ mzH8z4bT2ZnTy9cUzw+qcFVgYrkoLUrH+imwbJiLKgKVuIXb+SYdn2vt3UUdsT3DNSqu R5UA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=zFX9159X; 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 b4si10939519ejp.577.2020.06.16.08.41.28; Tue, 16 Jun 2020 08:41:28 -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=zFX9159X; 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 S1730634AbgFPPl1 (ORCPT + 15 others); Tue, 16 Jun 2020 11:41:27 -0400 Received: from mail.kernel.org ([198.145.29.99]:57072 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730106AbgFPPlZ (ORCPT ); Tue, 16 Jun 2020 11:41:25 -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 51ED7207C4; Tue, 16 Jun 2020 15:41:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592322084; bh=REfJ7+ONixLxyVEXno+zYpwYGwcixL3r/XPDzbPOx0Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zFX9159XZQd+sR8GuVt/tyzgNk6GI5ac7NfnaBpru7Ipi4ZN0eKJJqeL1WnCTvhzu tUkNhPExmaxTBlpkQrEDXtCMkAp9UfQhCGvNozGqrroMAEcRWvV7BHeGrfMqHFkNaX a7YLncbbuL1dtfVjmTkz/KyYzQYXcZkftm+1rfjE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ulf Hansson Subject: [PATCH 5.4 129/134] mmc: sdio: Fix potential NULL pointer error in mmc_sdio_init_card() Date: Tue, 16 Jun 2020 17:35:13 +0200 Message-Id: <20200616153106.967580831@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200616153100.633279950@linuxfoundation.org> References: <20200616153100.633279950@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; } /*