Patchwork mtd gpmi-nand: Fix read page when reading to vmalloced area

login
register
mail settings
Submitter Sascha Hauer
Date June 26, 2012, 3:26 p.m.
Message ID <1340724377-22279-1-git-send-email-s.hauer@pengutronix.de>
Download mbox | patch
Permalink /patch/167419/
State Accepted
Commit 6023813a2d5949ba368e7df464f2ccb649719777
Headers show

Comments

Sascha Hauer - June 26, 2012, 3:26 p.m.
The gpmi-nand driver uses virt_addr_valid() to check whether a buffer
is suitable for dma. If it's not, a driver allocated buffer is used
instead. Then after a page read the driver allocated buffer must be
copied to the user supplied buffer. This does not happen since:

commit 7725cc85932bd02dd12c23108e0ef748c551ccba
Author: Brian Norris <computersforpeace@gmail.com>
Date:   Wed May 2 10:15:02 2012 -0700

    mtd: gpmi-nand: utilize oob_requested parameter

    Don't read OOB if the caller didn't request it.

    Signed-off-by: Brian Norris <computersforpeace@gmail.com>
    Acked-by: Huang Shijie <b32955@freescale.com>
    Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
    Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

This patch fixes this. The bug is encountered with UBI which uses a vmalloced
buffer for the volume table.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Cc: stable@vger.kernel.org
Cc: Huang Shijie <b32955@freescale.com>
Cc: Brian Norris <computersforpeace@gmail.com>
Cc: Subodh Nijsure <snijsure@grid-net.com>
---
 drivers/mtd/nand/gpmi-nand/gpmi-nand.c |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
Huang Shijie - June 27, 2012, 2:18 a.m.
于 2012年06月26日 23:26, Sascha Hauer 写道:
> The gpmi-nand driver uses virt_addr_valid() to check whether a buffer
> is suitable for dma. If it's not, a driver allocated buffer is used
> instead. Then after a page read the driver allocated buffer must be
> copied to the user supplied buffer. This does not happen since:
>
> commit 7725cc85932bd02dd12c23108e0ef748c551ccba
> Author: Brian Norris <computersforpeace@gmail.com>
> Date:   Wed May 2 10:15:02 2012 -0700
>
>     mtd: gpmi-nand: utilize oob_requested parameter
>
>     Don't read OOB if the caller didn't request it.
>
>     Signed-off-by: Brian Norris <computersforpeace@gmail.com>
>     Acked-by: Huang Shijie <b32955@freescale.com>
>     Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
>     Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
>
> This patch fixes this. The bug is encountered with UBI which uses a vmalloced
> buffer for the volume table.
>
> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> Cc: stable@vger.kernel.org
> Cc: Huang Shijie <b32955@freescale.com>
> Cc: Brian Norris <computersforpeace@gmail.com>
> Cc: Subodh Nijsure <snijsure@grid-net.com>
> ---
>  drivers/mtd/nand/gpmi-nand/gpmi-nand.c |   10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
> index 6bb6f48..0179685 100644
> --- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
> +++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
> @@ -920,12 +920,12 @@ static int gpmi_ecc_read_page(struct mtd_info *mtd, struct nand_chip *chip,
>  		 */
>  		memset(chip->oob_poi, ~0, mtd->oobsize);
>  		chip->oob_poi[0] = ((uint8_t *) auxiliary_virt)[0];
> -
> -		read_page_swap_end(this, buf, mtd->writesize,
> -				this->payload_virt, this->payload_phys,
> -				nfc_geo->payload_size,
> -				payload_virt, payload_phys);
>  	}
> +
> +	read_page_swap_end(this, buf, mtd->writesize,
> +			this->payload_virt, this->payload_phys,
> +			nfc_geo->payload_size,
> +			payload_virt, payload_phys);
>  exit_nfc:
>  	return ret;
>  }
Thanks a lot for debugging this bug. I am really busy recently, and have
no time to debug it.



Acked-by: Huang Shijie <b32955@freescale.com>
Sascha Hauer - June 27, 2012, 6:24 a.m.
On Tue, Jun 26, 2012 at 05:26:16PM +0200, Sascha Hauer wrote:
> The gpmi-nand driver uses virt_addr_valid() to check whether a buffer
> is suitable for dma. If it's not, a driver allocated buffer is used
> instead. Then after a page read the driver allocated buffer must be
> copied to the user supplied buffer. This does not happen since:
> 
> commit 7725cc85932bd02dd12c23108e0ef748c551ccba
> Author: Brian Norris <computersforpeace@gmail.com>
> Date:   Wed May 2 10:15:02 2012 -0700
> 
>     mtd: gpmi-nand: utilize oob_requested parameter
> 
>     Don't read OOB if the caller didn't request it.
> 
>     Signed-off-by: Brian Norris <computersforpeace@gmail.com>
>     Acked-by: Huang Shijie <b32955@freescale.com>
>     Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
>     Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
> 
> This patch fixes this. The bug is encountered with UBI which uses a vmalloced
> buffer for the volume table.
> 
> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> Cc: stable@vger.kernel.org

Sorry, please remove the stable tag, this bug was introduced in the last
merge window.

Sascha
Subodh Nijsure - June 27, 2012, 10:07 p.m.
Tested this modification on MX28 hardware that I have access to. With 
this patch I can now create UBI file system on flash.

Tested-by: snijsure@grid-net.com

Thanks!
-Subodh

On 06/26/2012 08:26 AM, Sascha Hauer wrote:
> The gpmi-nand driver uses virt_addr_valid() to check whether a buffer
> is suitable for dma. If it's not, a driver allocated buffer is used
> instead. Then after a page read the driver allocated buffer must be
> copied to the user supplied buffer. This does not happen since:
>
> commit 7725cc85932bd02dd12c23108e0ef748c551ccba
> Author: Brian Norris <computersforpeace@gmail.com>
> Date:   Wed May 2 10:15:02 2012 -0700
>
>      mtd: gpmi-nand: utilize oob_requested parameter
>
>      Don't read OOB if the caller didn't request it.
>
>      Signed-off-by: Brian Norris <computersforpeace@gmail.com>
>      Acked-by: Huang Shijie <b32955@freescale.com>
>      Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
>      Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
>
> This patch fixes this. The bug is encountered with UBI which uses a vmalloced
> buffer for the volume table.
>
> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> Cc: stable@vger.kernel.org
> Cc: Huang Shijie <b32955@freescale.com>
> Cc: Brian Norris <computersforpeace@gmail.com>
> Cc: Subodh Nijsure <snijsure@grid-net.com>
> ---
>   drivers/mtd/nand/gpmi-nand/gpmi-nand.c |   10 +++++-----
>   1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
> index 6bb6f48..0179685 100644
> --- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
> +++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
> @@ -920,12 +920,12 @@ static int gpmi_ecc_read_page(struct mtd_info *mtd, struct nand_chip *chip,
>   		 */
>   		memset(chip->oob_poi, ~0, mtd->oobsize);
>   		chip->oob_poi[0] = ((uint8_t *) auxiliary_virt)[0];
> -
> -		read_page_swap_end(this, buf, mtd->writesize,
> -				this->payload_virt, this->payload_phys,
> -				nfc_geo->payload_size,
> -				payload_virt, payload_phys);
>   	}
> +
> +	read_page_swap_end(this, buf, mtd->writesize,
> +			this->payload_virt, this->payload_phys,
> +			nfc_geo->payload_size,
> +			payload_virt, payload_phys);
>   exit_nfc:
>   	return ret;
>   }
Artem Bityutskiy - June 29, 2012, 7:10 a.m.
On Tue, 2012-06-26 at 17:26 +0200, Sascha Hauer wrote:
> The gpmi-nand driver uses virt_addr_valid() to check whether a buffer
> is suitable for dma. If it's not, a driver allocated buffer is used
> instead. Then after a page read the driver allocated buffer must be
> copied to the user supplied buffer. This does not happen since:

Pushed to l2-mtd.git, thanks.

Patch

diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
index 6bb6f48..0179685 100644
--- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
+++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
@@ -920,12 +920,12 @@  static int gpmi_ecc_read_page(struct mtd_info *mtd, struct nand_chip *chip,
 		 */
 		memset(chip->oob_poi, ~0, mtd->oobsize);
 		chip->oob_poi[0] = ((uint8_t *) auxiliary_virt)[0];
-
-		read_page_swap_end(this, buf, mtd->writesize,
-				this->payload_virt, this->payload_phys,
-				nfc_geo->payload_size,
-				payload_virt, payload_phys);
 	}
+
+	read_page_swap_end(this, buf, mtd->writesize,
+			this->payload_virt, this->payload_phys,
+			nfc_geo->payload_size,
+			payload_virt, payload_phys);
 exit_nfc:
 	return ret;
 }