From patchwork Fri Jun 19 14:31:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 191208 Delivered-To: patch@linaro.org Received: by 2002:a92:cf06:0:0:0:0:0 with SMTP id c6csp595546ilo; Fri, 19 Jun 2020 07:47:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwbJy62Hq0P2L1DIfc4UVoKV1BWeHCy6VHw3v7xv4J78uXFWcmS6Zjm1nNbByz8Qhs5bGAe X-Received: by 2002:a17:906:c53:: with SMTP id t19mr4250039ejf.143.1592578076424; Fri, 19 Jun 2020 07:47:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592578076; cv=none; d=google.com; s=arc-20160816; b=CRwWqO+CfhRFOfIkiycacvfYjUmwgVag25EQJwmQ31daO44Xu/a2+lB77kBTYu5Cbd kL5GZCypW2FUsoAane7FhvlcODe38HoLRdfh4V71t/beg5I19HIQckyf+rCZGQ60cAHk yU2LpZVgNZ+gp/6givSsN8LMJJeJ2Drs7gBBPAJpzKL91k/Ogfln6VF7eHaGRxndXDN2 4aNNh9BaizeBUsIs3lPalQOdhelCYbFwqcxP5Xn9R+nO2BBHIi0hX+eGA58fgF2A5lmu iN1rsTdc7vS0onB/vD9KQw7g/0aXxIco1aL4N/dnZCfHLhb4OHdEVPoPMJDF9JYkPDam aYxA== 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=rxjxWmiu1kww9AMUiVqCjJwAVmcZzSdjkRMlBBfbOSQ=; b=LvqA8zCigeUjgR41x/kiHHmyQACueRwg3j0mqRlOs3vFv9fgFO/6vaKno+z32+QU1Q Gli2nGiTGYQRe0lcLP5Msjc//eDsVKEfsCoDCj7Ql5AjkVqviViZYZ4yAVtyZW9untNU uoTpGt5bYSvVWhcJd/N7pNU2jvHeUKdPgOjjTp2e5z9H9ZOAXSHZiOntbq5rdRDjboOq V5bvWTi+hBOiWRSFCx4QI4jrEH7vfKOlc7qx1fp/rW8+EOqaVGZ/057dKO+JBSAuhpT0 +wrBuSfpRW/rhdY4k4b+4vov3FUQe3TdUgwZzgejhVKxFogLIy8TMEbHX1nF5PfoIm82 DEMQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=lUIgPpI9; 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 g15si4378424ejx.146.2020.06.19.07.47.56; Fri, 19 Jun 2020 07:47:56 -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=lUIgPpI9; 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 S2389006AbgFSOry (ORCPT + 15 others); Fri, 19 Jun 2020 10:47:54 -0400 Received: from mail.kernel.org ([198.145.29.99]:40062 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388995AbgFSOrw (ORCPT ); Fri, 19 Jun 2020 10:47:52 -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 2357D217BA; Fri, 19 Jun 2020 14:47:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592578072; bh=teb3FwMcn/LZC2JxJ2kLyr8Dlm6V1HLPADvCts2Aa0Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lUIgPpI9rVy2ihC2M6qj1H5s/swEIHkSc7T8UkUPp5mha5DyQI/QqQygmpmZIlhkL vW3ETcvi9fJ61oiAK/K5CN7HyOu3s+OIukcaRoC2bfZSjDMSdCWdnbB8/xJ3LojaFg XRQxBy525yPBYvb4Zam/hOJqgbu3+rjMdBZKUAVI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ulf Hansson Subject: [PATCH 4.14 072/190] mmc: sdio: Fix potential NULL pointer error in mmc_sdio_init_card() Date: Fri, 19 Jun 2020 16:31:57 +0200 Message-Id: <20200619141637.192185712@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200619141633.446429600@linuxfoundation.org> References: <20200619141633.446429600@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 @@ -717,9 +717,8 @@ try_again: /* Retry init sequence, but without R4_18V_PRESENT. */ retries = 0; goto try_again; - } else { - goto remove; } + return err; } /*