From patchwork Wed Apr 4 12:42:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Abhishek Sahu X-Patchwork-Id: 10322527 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 725CD60318 for ; Wed, 4 Apr 2018 12:43:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 646C728D59 for ; Wed, 4 Apr 2018 12:43:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 58A9728E79; Wed, 4 Apr 2018 12:43:11 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 01ECB28D59 for ; Wed, 4 Apr 2018 12:43:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751439AbeDDMnI (ORCPT ); Wed, 4 Apr 2018 08:43:08 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:40880 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751038AbeDDMnG (ORCPT ); Wed, 4 Apr 2018 08:43:06 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 4A0F46055B; Wed, 4 Apr 2018 12:43:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1522845786; bh=dxRv2ymqQpVoWR/cIkE2MhhDLRFn3xqwR6NEvOsTDZI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JepWQMGem86MxIrdZ/dg57z/G3gHXNQb6IFvcWV4tnCdobyoWbjLsBOD8WoGeuWoB IMtPuoaVCDGks8yzy2xh3OpkBtqEPCFb5BOWAg6exgio3dvoWQJwCSvlROQ5WkVFfm wrYC+jixLE9f8CNI6DpZcrwIvmLHXhUhyw4F34Wc= Received: from absahu-linux.qualcomm.com (blr-c-bdr-fw-01_globalnat_allzones-outside.qualcomm.com [103.229.19.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: absahu@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id BED1260C65; Wed, 4 Apr 2018 12:42:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1522845785; bh=dxRv2ymqQpVoWR/cIkE2MhhDLRFn3xqwR6NEvOsTDZI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TP4ySqKw1DDUP1RSxv/VDXFAoIv8Mi/6B46FYlNk0rc9ps4Es98PtthCbQ1EFPe1R fObRSC/nhcpWnrXdjZyuq+5vd+SUwHd8NEytRLwYExVcDJK+YpBZeipMAqdZdhiqoM J4ttPVr/pCiPS3JG8YEFx61gelc/zgBQtfXkSSq8= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org BED1260C65 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=absahu@codeaurora.org From: Abhishek Sahu To: Boris Brezillon Cc: David Woodhouse , Brian Norris , Marek Vasut , Richard Weinberger , Cyrille Pitchen , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mtd@lists.infradead.org, Andy Gross , Archit Taneja , Abhishek Sahu Subject: [PATCH 4/9] mtd: nand: qcom: fix null pointer access for erased buffer detection Date: Wed, 4 Apr 2018 18:12:20 +0530 Message-Id: <1522845745-6624-5-git-send-email-absahu@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1522845745-6624-1-git-send-email-absahu@codeaurora.org> References: <1522845745-6624-1-git-send-email-absahu@codeaurora.org> MIME-Version: 1.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP parse_read_errors can be called with only oob buf also in which case data_buf will be NULL. If data_buf is NULL, then don’t treat this page as completely erased in case of ECC uncorrectable error. Signed-off-by: Abhishek Sahu --- drivers/mtd/nand/qcom_nandc.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/mtd/nand/qcom_nandc.c b/drivers/mtd/nand/qcom_nandc.c index 57c16a6..0ebcc55 100644 --- a/drivers/mtd/nand/qcom_nandc.c +++ b/drivers/mtd/nand/qcom_nandc.c @@ -1607,9 +1607,11 @@ static int parse_read_errors(struct qcom_nand_host *host, u8 *data_buf, if (host->bch_enabled) { erased = (erased_cw & ERASED_CW) == ERASED_CW ? true : false; - } else { + } else if (data_buf) { erased = erased_chunk_check_and_fixup(data_buf, data_len); + } else { + erased = false; } if (erased) { @@ -1652,7 +1654,8 @@ static int parse_read_errors(struct qcom_nand_host *host, u8 *data_buf, max_bitflips = max(max_bitflips, stat); } - data_buf += data_len; + if (data_buf) + data_buf += data_len; if (oob_buf) oob_buf += oob_len + ecc->bytes; }