Received: by 2002:a05:6a10:6d10:0:0:0:0 with SMTP id gq16csp2611757pxb; Mon, 18 Apr 2022 04:47:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwvMCCwh065eB+gM6P0hhmCjpD5YhAcMQmF72qG2jh7pBPk/6tEY7FtqB1Y8cWEgKQBNEYE X-Received: by 2002:a05:6402:26c7:b0:423:e5d6:b6c6 with SMTP id x7-20020a05640226c700b00423e5d6b6c6mr4517904edd.61.1650282474401; Mon, 18 Apr 2022 04:47:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650282474; cv=none; d=google.com; s=arc-20160816; b=Vyx3HFqHrkGWnKP72f5Su/GL3P1VsiSGzRRcHzu0nylwXFZ7atuXxjPxQN53ZmYHcJ Ffv1frrHg8Qu6TCqcmk1YnLunkprVG/BYDweUV3sgOQlq/YseE7vh2WSi3tMhZeZmmEw TKIRGifC6Yy2b+f/Gqhlc2IQqneWeF1fI0XdgT3KeoE1Ifud2Z9ZHrjiwXGIqPVhVzPN yqjphHNBMgVroJ4Wk9X/r/ocAjWjl7855pfsKentyxu8f3JUVBllZyGQ632Z8wdkB2uj q9HifBNkXWjFbQlJwwE79T0hOHC/ylSSiUQoO+cFHsXqPcq9+h8SPIHxaUZaTU4joark jpCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=eqXCPH2Ix3P7q6Pkc2odhbGuUpZIlP74n/gF441S+Vk=; b=P0ozIS10ESynQ69WwkG/9plI9BUAkEgsYXxuFg2Wd5JUPBNUf9XvuVc8xr9K5Mx0C5 8vQfH8/sEHg1zrGP2gPmUbf41VPLFEozs1k6BKXe7CwQ9dE6Y/A4QiO8IVH+URV6A/uT TxBmRZcHeiHTM6FTmhjO5ZTA+HFOS0ufZa+17Yz/2UaVR11A6uHW++F4Uo/2hLfDr7hY JjJEcV3AJ/fo8eRntfN/zTceJi815Sns1xUzk8fle9KDjXjSPwyUlFcNBlAGlrVJdn+3 x2++UoUaK4/pRANrFva16+kbL3ojEF5xzGIORSIPoSpeFRfPmBzrkyvqqcIQYQaXQyy6 f5nQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcdkim header.b=pYK5EDlm; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=quicinc.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i7-20020a170906264700b006e89c06638bsi6272792ejc.492.2022.04.18.04.47.29; Mon, 18 Apr 2022 04:47:54 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcdkim header.b=pYK5EDlm; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=quicinc.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236760AbiDRG0N (ORCPT + 99 others); Mon, 18 Apr 2022 02:26:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36108 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229565AbiDRG0M (ORCPT ); Mon, 18 Apr 2022 02:26:12 -0400 Received: from alexa-out.qualcomm.com (alexa-out.qualcomm.com [129.46.98.28]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 71BAB18B20; Sun, 17 Apr 2022 23:23:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; i=@quicinc.com; q=dns/txt; s=qcdkim; t=1650263014; x=1681799014; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=eqXCPH2Ix3P7q6Pkc2odhbGuUpZIlP74n/gF441S+Vk=; b=pYK5EDlmpOeTN/WANVF70qrhIYTo1hN3/FdJdgMUPE4KU2ky7W7uj6o9 3oNO4P/JK7UN5uMKfpmWkA3aI2FU6EcWtdYw0wMCz9eOqhuCw4AATe39z 2I5MdbnyzAFgt4q92Wj39D0x3yHf/Hqx0t8KkFDFRjAIsvt1sbc9TPZyM o=; Received: from ironmsg07-lv.qualcomm.com ([10.47.202.151]) by alexa-out.qualcomm.com with ESMTP; 17 Apr 2022 23:23:34 -0700 X-QCInternal: smtphost Received: from ironmsg01-blr.qualcomm.com ([10.86.208.130]) by ironmsg07-lv.qualcomm.com with ESMTP/TLS/AES256-SHA; 17 Apr 2022 23:23:32 -0700 X-QCInternal: smtphost Received: from mdalam-linux.qualcomm.com ([10.201.2.71]) by ironmsg01-blr.qualcomm.com with ESMTP; 18 Apr 2022 11:53:19 +0530 Received: by mdalam-linux.qualcomm.com (Postfix, from userid 466583) id CC9EC20D37; Mon, 18 Apr 2022 11:53:18 +0530 (IST) From: Md Sadre Alam To: mani@kernel.org, miquel.raynal@bootlin.com, richard@nod.at, vigneshr@ti.com, linux-mtd@lists.infradead.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Cc: konrad.dybcio@somainline.org, quic_srichara@quicinc.com, quic_mdalam@quicinc.com, stable@vger.kernel.org Subject: [PATCH V4] mtd: rawnand: qcom: fix memory corruption that causes panic Date: Mon, 18 Apr 2022 11:53:11 +0530 Message-Id: <1650262991-21588-1-git-send-email-quic_mdalam@quicinc.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch fixes a memory corruption that occurred in the nand_scan() path for Hynix nand device. On boot, for Hynix nand device will panic at a weird place: | Unable to handle kernel NULL pointer dereference at virtual address 00000070 | [00000070] *pgd=00000000 | Internal error: Oops: 5 [#1] PREEMPT SMP ARM | Modules linked in: | CPU: 0 PID: 1 Comm: swapper/0 Not tainted 5.17.0-01473-g13ae1769cfb0 #38 | Hardware name: Generic DT based system | PC is at nandc_set_reg+0x8/0x1c | LR is at qcom_nandc_command+0x20c/0x5d0 | pc : [] lr : [] psr: 00000113 | sp : c14adc50 ip : c14ee208 fp : c0cc970c | r10: 000000a3 r9 : 00000000 r8 : 00000040 | r7 : c16f6a00 r6 : 00000090 r5 : 00000004 r4 :c14ee040 | r3 : 00000000 r2 : 0000000b r1 : 00000000 r0 :c14ee040 | Flags: nzcv IRQs on FIQs on Mode SVC_32 ISA ARM Segment none | Control: 10c5387d Table: 8020406a DAC: 00000051 | Register r0 information: slab kmalloc-2k start c14ee000 pointer offset 64 size 2048 | Process swapper/0 (pid: 1, stack limit = 0x(ptrval)) | nandc_set_reg from qcom_nandc_command+0x20c/0x5d0 | qcom_nandc_command from nand_readid_op+0x198/0x1e8 | nand_readid_op from hynix_nand_has_valid_jedecid+0x30/0x78 | hynix_nand_has_valid_jedecid from hynix_nand_init+0xb8/0x454 | hynix_nand_init from nand_scan_with_ids+0xa30/0x14a8 | nand_scan_with_ids from qcom_nandc_probe+0x648/0x7b0 | qcom_nandc_probe from platform_probe+0x58/0xac The problem is that the nand_scan()'s qcom_nand_attach_chip callback is updating the nandc->max_cwperpage from 1 to 4 or 8 based on page size. This causes the sg_init_table of clear_bam_transaction() in the driver's qcom_nandc_command() to memset much more than what was initially allocated by alloc_bam_transaction(). This patch will update nandc->max_cwperpage 1 to 4 or 8 based on page size in qcom_nand_attach_chip call back after freeing the previously allocated memory for bam txn as per nandc->max_cwperpage = 1 and then again allocating bam txn as per nandc->max_cwperpage = 4 or 8 based on page size in qcom_nand_attach_chip call back itself. Cc: stable@vger.kernel.org Fixes: 6a3cec64f18c ("mtd: rawnand: qcom: convert driver to nand_scan()") Reported-by: Konrad Dybcio Signed-off-by: Md Sadre Alam Signed-off-by: Sricharan R --- Changes in V4: * Incorporated "commit log wrong" comment from Mani * Updated commit log Changes in V3: * Incorporated "Fixes tags are missing" comment from Miquèl * Added Fixes tag Fixes:6a3cec64f18c ("mtd: rawnand: qcom: convert driver to nand_scan()") * Incorporated "stable tag missing" comment from Miquèl * Added stable tag Cc: stable@vger.kernel.org * Incorporated "Reported-by tag missing" comment from Mani * Added Reported-by tag Reported-by: Konrad Dybcio Changes in V2: * Incorporated "alloc_bam_transaction inside qcom_nand_attach_chip" suggestion from Mani * Freed previously alloacted memory for bam txn before updating max_cwperpage inside qcom_nand_attach_chip(). * Moved alloc_bam_transaction() inside qcom_nand_attach_chip(). after upding max_cwperpage 4 or 8 based on page size. drivers/mtd/nand/raw/qcom_nandc.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/drivers/mtd/nand/raw/qcom_nandc.c b/drivers/mtd/nand/raw/qcom_nandc.c index 1a77542..048b255 100644 --- a/drivers/mtd/nand/raw/qcom_nandc.c +++ b/drivers/mtd/nand/raw/qcom_nandc.c @@ -2651,10 +2651,23 @@ static int qcom_nand_attach_chip(struct nand_chip *chip) ecc->engine_type = NAND_ECC_ENGINE_TYPE_ON_HOST; mtd_set_ooblayout(mtd, &qcom_nand_ooblayout_ops); + /* Free the initially allocated BAM transaction for reading the ONFI params */ + if (nandc->props->is_bam) + free_bam_transaction(nandc); nandc->max_cwperpage = max_t(unsigned int, nandc->max_cwperpage, cwperpage); + /* Now allocate the BAM transaction based on updated max_cwperpage */ + if (nandc->props->is_bam) { + nandc->bam_txn = alloc_bam_transaction(nandc); + if (!nandc->bam_txn) { + dev_err(nandc->dev, + "failed to allocate bam transaction\n"); + return -ENOMEM; + } + } + /* * DATA_UD_BYTES varies based on whether the read/write command protects * spare data with ECC too. We protect spare data by default, so we set @@ -2955,17 +2968,6 @@ static int qcom_nand_host_init_and_register(struct qcom_nand_controller *nandc, if (ret) return ret; - if (nandc->props->is_bam) { - free_bam_transaction(nandc); - nandc->bam_txn = alloc_bam_transaction(nandc); - if (!nandc->bam_txn) { - dev_err(nandc->dev, - "failed to allocate bam transaction\n"); - nand_cleanup(chip); - return -ENOMEM; - } - } - ret = mtd_device_parse_register(mtd, probes, NULL, NULL, 0); if (ret) nand_cleanup(chip); -- 2.7.4